aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/scsi/be2iscsi/be_main.c
diff options
context:
space:
mode:
authorChristoph Hellwig <hch@lst.de>2015-12-07 09:41:11 -0500
committerChristoph Hellwig <hch@lst.de>2015-12-11 14:52:26 -0500
commitea51190c03150fce4d9e428bfb608abbe0991db8 (patch)
tree80c61fdc0817b5f1c5667155cf7256f688b71c63 /drivers/scsi/be2iscsi/be_main.c
parent78d0264eb7a938f1eaf59fcb2d3f7da2567369d3 (diff)
irq_poll: fold irq_poll_sched_prep into irq_poll_sched
There is no good reason to keep them apart, and this makes using the API a bit simpler. Signed-off-by: Christoph Hellwig <hch@lst.de> Reviewed-by: Bart Van Assche <bart.vanassche@sandisk.com>
Diffstat (limited to 'drivers/scsi/be2iscsi/be_main.c')
-rw-r--r--drivers/scsi/be2iscsi/be_main.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/scsi/be2iscsi/be_main.c b/drivers/scsi/be2iscsi/be_main.c
index 471e2b942435..cb9072a841be 100644
--- a/drivers/scsi/be2iscsi/be_main.c
+++ b/drivers/scsi/be2iscsi/be_main.c
@@ -910,8 +910,7 @@ static irqreturn_t be_isr_msix(int irq, void *dev_id)
910 num_eq_processed = 0; 910 num_eq_processed = 0;
911 while (eqe->dw[offsetof(struct amap_eq_entry, valid) / 32] 911 while (eqe->dw[offsetof(struct amap_eq_entry, valid) / 32]
912 & EQE_VALID_MASK) { 912 & EQE_VALID_MASK) {
913 if (!irq_poll_sched_prep(&pbe_eq->iopoll)) 913 irq_poll_sched(&pbe_eq->iopoll);
914 irq_poll_sched(&pbe_eq->iopoll);
915 914
916 AMAP_SET_BITS(struct amap_eq_entry, valid, eqe, 0); 915 AMAP_SET_BITS(struct amap_eq_entry, valid, eqe, 0);
917 queue_tail_inc(eq); 916 queue_tail_inc(eq);
@@ -972,8 +971,7 @@ static irqreturn_t be_isr(int irq, void *dev_id)
972 spin_unlock_irqrestore(&phba->isr_lock, flags); 971 spin_unlock_irqrestore(&phba->isr_lock, flags);
973 num_mcceq_processed++; 972 num_mcceq_processed++;
974 } else { 973 } else {
975 if (!irq_poll_sched_prep(&pbe_eq->iopoll)) 974 irq_poll_sched(&pbe_eq->iopoll);
976 irq_poll_sched(&pbe_eq->iopoll);
977 num_ioeq_processed++; 975 num_ioeq_processed++;
978 } 976 }
979 AMAP_SET_BITS(struct amap_eq_entry, valid, eqe, 0); 977 AMAP_SET_BITS(struct amap_eq_entry, valid, eqe, 0);