Commit 04ea30c8 authored by Julian Wiedmann's avatar Julian Wiedmann Committed by David S. Miller
Browse files

s390/qeth: don't call INIT_LIST_HEAD() on iob's list entry 



INIT_LIST_HEAD() only needs to be called on actual list heads.
While at it clarify the naming of the field.

Suggested-by: default avatarVasily Gorbik <gor@linux.ibm.com>
Signed-off-by: default avatarJulian Wiedmann <jwi@linux.ibm.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent af3f4a85

drivers/s390/net/qeth_core.h

+1 −1
Original line number Diff line number Diff line
@@ -624,7 +624,7 @@ struct qeth_reply { 
};



struct qeth_cmd_buffer {

	struct list_head list;

	struct list_head list_entry;

	struct completion done;

	spinlock_t lock;

	unsigned int length;

drivers/s390/net/qeth_core_main.c

+4 −5
Original line number Diff line number Diff line
@@ -615,7 +615,7 @@ static void qeth_enqueue_cmd(struct qeth_card *card, 
			     struct qeth_cmd_buffer *iob)

{

	spin_lock_irq(&card->lock);

	list_add_tail(&iob->list, &card->cmd_waiter_list);

	list_add_tail(&iob->list_entry, &card->cmd_waiter_list);

	spin_unlock_irq(&card->lock);

}
@@ -623,7 +623,7 @@ static void qeth_dequeue_cmd(struct qeth_card *card, 
			     struct qeth_cmd_buffer *iob)

{

	spin_lock_irq(&card->lock);

	list_del(&iob->list);

	list_del(&iob->list_entry);

	spin_unlock_irq(&card->lock);

}
@@ -977,7 +977,7 @@ static void qeth_clear_ipacmd_list(struct qeth_card *card) 
	QETH_CARD_TEXT(card, 4, "clipalst");



	spin_lock_irqsave(&card->lock, flags);

	list_for_each_entry(iob, &card->cmd_waiter_list, list)

	list_for_each_entry(iob, &card->cmd_waiter_list, list_entry)

		qeth_notify_cmd(iob, -ECANCELED);

	spin_unlock_irqrestore(&card->lock, flags);

}
@@ -1047,7 +1047,6 @@ struct qeth_cmd_buffer *qeth_alloc_cmd(struct qeth_channel *channel, 


	init_completion(&iob->done);

	spin_lock_init(&iob->lock);

	INIT_LIST_HEAD(&iob->list);

	refcount_set(&iob->ref_count, 1);

	iob->channel = channel;

	iob->timeout = timeout;
@@ -1094,7 +1093,7 @@ static void qeth_issue_next_read_cb(struct qeth_card *card, 


	/* match against pending cmd requests */

	spin_lock_irqsave(&card->lock, flags);

	list_for_each_entry(tmp, &card->cmd_waiter_list, list) {

	list_for_each_entry(tmp, &card->cmd_waiter_list, list_entry) {

		if (tmp->match && tmp->match(tmp, iob)) {

			request = tmp;

			/* take the object outside the lock */