Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 118ce7ab authored by Arnd Bergmann's avatar Arnd Bergmann Committed by David S. Miller
Browse files

atm: nicstar: remove interruptible_sleep_on_timeout 



We are trying to finally kill off interruptible_sleep_on_timeout.
the two uses in the nicstar driver can be trivially replaced
with wait_event_interruptible_lock_irq_timeout, which prevents the
wake-up race and is able to check the buffer state with scq->lock
held.

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Acked-by: default avatarChas Williams <chas@cmf.nrl.navy.mil>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 740b0f18

drivers/atm/nicstar.c

+8 −8
Original line number Diff line number Diff line
@@ -1739,10 +1739,10 @@ static int push_scqe(ns_dev * card, vc_map * vc, scq_info * scq, ns_scqe * tbd, 
		}



		scq->full = 1;

		spin_unlock_irqrestore(&scq->lock, flags);

		interruptible_sleep_on_timeout(&scq->scqfull_waitq,

		wait_event_interruptible_lock_irq_timeout(scq->scqfull_waitq,

							  scq->tail != scq->next,

							  scq->lock,

							  SCQFULL_TIMEOUT);

		spin_lock_irqsave(&scq->lock, flags);



		if (scq->full) {

			spin_unlock_irqrestore(&scq->lock, flags);
@@ -1789,10 +1789,10 @@ static int push_scqe(ns_dev * card, vc_map * vc, scq_info * scq, ns_scqe * tbd, 
			scq->full = 1;

			if (has_run++)

				break;

			spin_unlock_irqrestore(&scq->lock, flags);

			interruptible_sleep_on_timeout(&scq->scqfull_waitq,

			wait_event_interruptible_lock_irq_timeout(scq->scqfull_waitq,

								  scq->tail != scq->next,

								  scq->lock,

								  SCQFULL_TIMEOUT);

			spin_lock_irqsave(&scq->lock, flags);

		}



		if (!scq->full) {