irq_poll: don't disable new irq_poll instances

There is no good reason to start out disabled - drivers can control if
the poll instance can be scheduled by simply not scheduling it yet.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Bart Van Assche <bart.vanassche@sandisk.com>

diff --git a/drivers/scsi/be2iscsi/be_main.c b/drivers/scsi/be2iscsi/be_main.c
index 1d879ef406d8878bd90612eabff81e01898dfceb..471e2b9424350996437aabbec8c9080029f608e3 100644 (file)
--- a/drivers/scsi/be2iscsi/be_main.c
+++ b/drivers/scsi/be2iscsi/be_main.c
@@ -5581,7 +5581,6 @@ static void beiscsi_eeh_resume(struct pci_dev *pdev)
                pbe_eq = &phwi_context->be_eq[i];
                irq_poll_init(&pbe_eq->iopoll, be_iopoll_budget,
                                be_iopoll);
-               irq_poll_enable(&pbe_eq->iopoll);
        }
 
        i = (phba->msix_enabled) ? i : 0;
@@ -5754,7 +5753,6 @@ static int beiscsi_dev_probe(struct pci_dev *pcidev,
                pbe_eq = &phwi_context->be_eq[i];
                irq_poll_init(&pbe_eq->iopoll, be_iopoll_budget,
                                be_iopoll);
-               irq_poll_enable(&pbe_eq->iopoll);
        }
 
        i = (phba->msix_enabled) ? i : 0;

diff --git a/drivers/scsi/ipr.c b/drivers/scsi/ipr.c
index 6b9c738cdc18aa4a43f2f43760239107badadb39..402e4ca32d70aa81a378ae4cc6e2b66c06a5002f 100644 (file)
--- a/drivers/scsi/ipr.c
+++ b/drivers/scsi/ipr.c
@@ -3708,7 +3708,6 @@ static ssize_t ipr_store_iopoll_weight(struct device *dev,
                for (i = 1; i < ioa_cfg->hrrq_num; i++) {
                        irq_poll_init(&ioa_cfg->hrrq[i].iopoll,
                                        ioa_cfg->iopoll_weight, ipr_iopoll);
-                       irq_poll_enable(&ioa_cfg->hrrq[i].iopoll);
                }
        }
        spin_unlock_irqrestore(shost->host_lock, lock_flags);
@@ -10407,7 +10406,6 @@ static int ipr_probe(struct pci_dev *pdev, const struct pci_device_id *dev_id)
                for (i = 1; i < ioa_cfg->hrrq_num; i++) {
                        irq_poll_init(&ioa_cfg->hrrq[i].iopoll,
                                        ioa_cfg->iopoll_weight, ipr_iopoll);
-                       irq_poll_enable(&ioa_cfg->hrrq[i].iopoll);
                }
        }
 

diff --git a/lib/irq_poll.c b/lib/irq_poll.c
index e6fd1dc0908bdb61ed244b29ec84dbda18adb8c6..88af87971e8ca51fe5c2a26aaf0f42fd1d8d9129 100644 (file)
--- a/lib/irq_poll.c
+++ b/lib/irq_poll.c
@@ -170,8 +170,7 @@ EXPORT_SYMBOL(irq_poll_enable);
  * @poll_fn:  The handler to invoke
  *
  * Description:
- *     Initialize this irq_poll structure. Before being actively used, the
- *     driver must call irq_poll_enable().
+ *     Initialize and enable this irq_poll structure.
  **/
 void irq_poll_init(struct irq_poll *iop, int weight, irq_poll_fn *poll_fn)
 {
@@ -179,7 +178,6 @@ void irq_poll_init(struct irq_poll *iop, int weight, irq_poll_fn *poll_fn)
        INIT_LIST_HEAD(&iop->list);
        iop->weight = weight;
        iop->poll = poll_fn;
-       set_bit(IRQ_POLL_F_SCHED, &iop->state);
 }
 EXPORT_SYMBOL(irq_poll_init);