The in_interrupt() macro is deprecated. Also, it's usage in NCR5380_poll_politely2() has long been redundant. Cc: Sebastian Andrzej Siewior <bigeasy@xxxxxxxxxxxxx> Cc: Ahmed S. Darwish <a.darwish@xxxxxxxxxxxxx> Cc: Thomas Gleixner <tglx@xxxxxxxxxxxxx> Link: https://lore.kernel.org/r/20201126132952.2287996-1-bigeasy@xxxxxxxxxxxxx Signed-off-by: Finn Thain <fthain@xxxxxxxxxxxxxxxxxxx> --- drivers/scsi/NCR5380.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/scsi/NCR5380.c b/drivers/scsi/NCR5380.c index 462d911a89f2..6972e7ceb81a 100644 --- a/drivers/scsi/NCR5380.c +++ b/drivers/scsi/NCR5380.c @@ -223,7 +223,10 @@ static int NCR5380_poll_politely2(struct NCR5380_hostdata *hostdata, cpu_relax(); } while (n--); - if (irqs_disabled() || in_interrupt()) + /* Sleeping is not allowed when in atomic or interrupt contexts. + * Callers in such contexts always disable local irqs. + */ + if (irqs_disabled()) return -ETIMEDOUT; /* Repeatedly sleep for 1 ms until deadline */ -- 2.26.2
