diff options
author | Christoph Hellwig <hch@lst.de> | 2015-12-07 09:38:28 -0500 |
---|---|---|
committer | Christoph Hellwig <hch@lst.de> | 2015-12-11 14:52:25 -0500 |
commit | 78d0264eb7a938f1eaf59fcb2d3f7da2567369d3 (patch) | |
tree | a6e47a7af610dd802b202b1e03b89d69f61a6fc1 | |
parent | 511cbce2ff8b9d322077909ee90c5d4b67b29b75 (diff) |
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>
-rw-r--r-- | drivers/scsi/be2iscsi/be_main.c | 2 | ||||
-rw-r--r-- | drivers/scsi/ipr.c | 2 | ||||
-rw-r--r-- | lib/irq_poll.c | 4 |
3 files changed, 1 insertions, 7 deletions
diff --git a/drivers/scsi/be2iscsi/be_main.c b/drivers/scsi/be2iscsi/be_main.c index 1d879ef406d8..471e2b942435 100644 --- 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) | |||
5581 | pbe_eq = &phwi_context->be_eq[i]; | 5581 | pbe_eq = &phwi_context->be_eq[i]; |
5582 | irq_poll_init(&pbe_eq->iopoll, be_iopoll_budget, | 5582 | irq_poll_init(&pbe_eq->iopoll, be_iopoll_budget, |
5583 | be_iopoll); | 5583 | be_iopoll); |
5584 | irq_poll_enable(&pbe_eq->iopoll); | ||
5585 | } | 5584 | } |
5586 | 5585 | ||
5587 | i = (phba->msix_enabled) ? i : 0; | 5586 | i = (phba->msix_enabled) ? i : 0; |
@@ -5754,7 +5753,6 @@ static int beiscsi_dev_probe(struct pci_dev *pcidev, | |||
5754 | pbe_eq = &phwi_context->be_eq[i]; | 5753 | pbe_eq = &phwi_context->be_eq[i]; |
5755 | irq_poll_init(&pbe_eq->iopoll, be_iopoll_budget, | 5754 | irq_poll_init(&pbe_eq->iopoll, be_iopoll_budget, |
5756 | be_iopoll); | 5755 | be_iopoll); |
5757 | irq_poll_enable(&pbe_eq->iopoll); | ||
5758 | } | 5756 | } |
5759 | 5757 | ||
5760 | i = (phba->msix_enabled) ? i : 0; | 5758 | i = (phba->msix_enabled) ? i : 0; |
diff --git a/drivers/scsi/ipr.c b/drivers/scsi/ipr.c index 6b9c738cdc18..402e4ca32d70 100644 --- a/drivers/scsi/ipr.c +++ b/drivers/scsi/ipr.c | |||
@@ -3708,7 +3708,6 @@ static ssize_t ipr_store_iopoll_weight(struct device *dev, | |||
3708 | for (i = 1; i < ioa_cfg->hrrq_num; i++) { | 3708 | for (i = 1; i < ioa_cfg->hrrq_num; i++) { |
3709 | irq_poll_init(&ioa_cfg->hrrq[i].iopoll, | 3709 | irq_poll_init(&ioa_cfg->hrrq[i].iopoll, |
3710 | ioa_cfg->iopoll_weight, ipr_iopoll); | 3710 | ioa_cfg->iopoll_weight, ipr_iopoll); |
3711 | irq_poll_enable(&ioa_cfg->hrrq[i].iopoll); | ||
3712 | } | 3711 | } |
3713 | } | 3712 | } |
3714 | spin_unlock_irqrestore(shost->host_lock, lock_flags); | 3713 | 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) | |||
10407 | for (i = 1; i < ioa_cfg->hrrq_num; i++) { | 10406 | for (i = 1; i < ioa_cfg->hrrq_num; i++) { |
10408 | irq_poll_init(&ioa_cfg->hrrq[i].iopoll, | 10407 | irq_poll_init(&ioa_cfg->hrrq[i].iopoll, |
10409 | ioa_cfg->iopoll_weight, ipr_iopoll); | 10408 | ioa_cfg->iopoll_weight, ipr_iopoll); |
10410 | irq_poll_enable(&ioa_cfg->hrrq[i].iopoll); | ||
10411 | } | 10409 | } |
10412 | } | 10410 | } |
10413 | 10411 | ||
diff --git a/lib/irq_poll.c b/lib/irq_poll.c index e6fd1dc0908b..88af87971e8c 100644 --- a/lib/irq_poll.c +++ b/lib/irq_poll.c | |||
@@ -170,8 +170,7 @@ EXPORT_SYMBOL(irq_poll_enable); | |||
170 | * @poll_fn: The handler to invoke | 170 | * @poll_fn: The handler to invoke |
171 | * | 171 | * |
172 | * Description: | 172 | * Description: |
173 | * Initialize this irq_poll structure. Before being actively used, the | 173 | * Initialize and enable this irq_poll structure. |
174 | * driver must call irq_poll_enable(). | ||
175 | **/ | 174 | **/ |
176 | void irq_poll_init(struct irq_poll *iop, int weight, irq_poll_fn *poll_fn) | 175 | void irq_poll_init(struct irq_poll *iop, int weight, irq_poll_fn *poll_fn) |
177 | { | 176 | { |
@@ -179,7 +178,6 @@ void irq_poll_init(struct irq_poll *iop, int weight, irq_poll_fn *poll_fn) | |||
179 | INIT_LIST_HEAD(&iop->list); | 178 | INIT_LIST_HEAD(&iop->list); |
180 | iop->weight = weight; | 179 | iop->weight = weight; |
181 | iop->poll = poll_fn; | 180 | iop->poll = poll_fn; |
182 | set_bit(IRQ_POLL_F_SCHED, &iop->state); | ||
183 | } | 181 | } |
184 | EXPORT_SYMBOL(irq_poll_init); | 182 | EXPORT_SYMBOL(irq_poll_init); |
185 | 183 | ||