1 files changed, 11 insertions, 14 deletions

diff --git a/drivers/scsi/ipr.c b/drivers/scsi/ipr.c
index 536cd5a80422..82031e00b2e9 100644
--- a/drivers/scsi/ipr.c
+++ b/drivers/scsi/ipr.c
@@ -3638,7 +3638,7 @@ static struct device_attribute ipr_ioa_reset_attr = {
         .store = ipr_store_reset_adapter
 };
 
-static int ipr_iopoll(struct blk_iopoll *iop, int budget);
+static int ipr_iopoll(struct irq_poll *iop, int budget);
  /**
  * ipr_show_iopoll_weight - Show ipr polling mode
  * @dev:        class device struct
@@ -3681,34 +3681,33 @@ static ssize_t ipr_store_iopoll_weight(struct device *dev,
         int i;
 
         if (!ioa_cfg->sis64) {
-                dev_info(&ioa_cfg->pdev->dev, "blk-iopoll not supported on this adapter\n");
+                dev_info(&ioa_cfg->pdev->dev, "irq_poll not supported on this adapter\n");
                 return -EINVAL;
         }
         if (kstrtoul(buf, 10, &user_iopoll_weight))
                 return -EINVAL;
 
         if (user_iopoll_weight > 256) {
-                dev_info(&ioa_cfg->pdev->dev, "Invalid blk-iopoll weight. It must be less than 256\n");
+                dev_info(&ioa_cfg->pdev->dev, "Invalid irq_poll weight. It must be less than 256\n");
                 return -EINVAL;
         }
 
         if (user_iopoll_weight == ioa_cfg->iopoll_weight) {
-                dev_info(&ioa_cfg->pdev->dev, "Current blk-iopoll weight has the same weight\n");
+                dev_info(&ioa_cfg->pdev->dev, "Current irq_poll weight has the same weight\n");
                 return strlen(buf);
         }
 
         if (ioa_cfg->iopoll_weight && ioa_cfg->sis64 && ioa_cfg->nvectors > 1) {
                 for (i = 1; i < ioa_cfg->hrrq_num; i++)
-                        blk_iopoll_disable(&ioa_cfg->hrrq[i].iopoll);
+                        irq_poll_disable(&ioa_cfg->hrrq[i].iopoll);
         }
 
         spin_lock_irqsave(shost->host_lock, lock_flags);
         ioa_cfg->iopoll_weight = user_iopoll_weight;
         if (ioa_cfg->iopoll_weight && ioa_cfg->sis64 && ioa_cfg->nvectors > 1) {
                 for (i = 1; i < ioa_cfg->hrrq_num; i++) {
-                        blk_iopoll_init(&ioa_cfg->hrrq[i].iopoll,
+                        irq_poll_init(&ioa_cfg->hrrq[i].iopoll,
                                         ioa_cfg->iopoll_weight, ipr_iopoll);
-                        blk_iopoll_enable(&ioa_cfg->hrrq[i].iopoll);
                 }
         }
         spin_unlock_irqrestore(shost->host_lock, lock_flags);
@@ -5569,7 +5568,7 @@ static int ipr_process_hrrq(struct ipr_hrr_queue *hrr_queue, int budget,
         return num_hrrq;
 }
 
-static int ipr_iopoll(struct blk_iopoll *iop, int budget)
+static int ipr_iopoll(struct irq_poll *iop, int budget)
 {
         struct ipr_ioa_cfg *ioa_cfg;
         struct ipr_hrr_queue *hrrq;
@@ -5585,7 +5584,7 @@ static int ipr_iopoll(struct blk_iopoll *iop, int budget)
         completed_ops = ipr_process_hrrq(hrrq, budget, &doneq);
 
         if (completed_ops < budget)
-                blk_iopoll_complete(iop);
+                irq_poll_complete(iop);
         spin_unlock_irqrestore(hrrq->lock, hrrq_flags);
 
         list_for_each_entry_safe(ipr_cmd, temp, &doneq, queue) {
@@ -5693,8 +5692,7 @@ static irqreturn_t ipr_isr_mhrrq(int irq, void *devp)
         if (ioa_cfg->iopoll_weight && ioa_cfg->sis64 && ioa_cfg->nvectors > 1) {
                 if ((be32_to_cpu(*hrrq->hrrq_curr) & IPR_HRRQ_TOGGLE_BIT) ==
                        hrrq->toggle_bit) {
-                        if (!blk_iopoll_sched_prep(&hrrq->iopoll))
-                                blk_iopoll_sched(&hrrq->iopoll);
+                        irq_poll_sched(&hrrq->iopoll);
                         spin_unlock_irqrestore(hrrq->lock, hrrq_flags);
                         return IRQ_HANDLED;
                 }
@@ -10405,9 +10403,8 @@ static int ipr_probe(struct pci_dev *pdev, const struct pci_device_id *dev_id)
 
         if (ioa_cfg->iopoll_weight && ioa_cfg->sis64 && ioa_cfg->nvectors > 1) {
                 for (i = 1; i < ioa_cfg->hrrq_num; i++) {
-                        blk_iopoll_init(&ioa_cfg->hrrq[i].iopoll,
+                        irq_poll_init(&ioa_cfg->hrrq[i].iopoll,
                                         ioa_cfg->iopoll_weight, ipr_iopoll);
-                        blk_iopoll_enable(&ioa_cfg->hrrq[i].iopoll);
                 }
         }
 
@@ -10436,7 +10433,7 @@ static void ipr_shutdown(struct pci_dev *pdev)
         if (ioa_cfg->iopoll_weight && ioa_cfg->sis64 && ioa_cfg->nvectors > 1) {
                 ioa_cfg->iopoll_weight = 0;
                 for (i = 1; i < ioa_cfg->hrrq_num; i++)
-                        blk_iopoll_disable(&ioa_cfg->hrrq[i].iopoll);
+                        irq_poll_disable(&ioa_cfg->hrrq[i].iopoll);
         }
 
         while (ioa_cfg->in_reset_reload) {