Kernel/linux-next
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git synced 2025-01-06 05:02:31 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

irq_poll: don't disable new irq_poll instances

Browse Source 
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>
This commit is contained in:
Christoph Hellwig 2015-12-07 06:38:28 -08:00
parent 511cbce2ff
commit 78d0264eb7
3 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/scsi/be2iscsi/be_main.c
View File

@ -5581,7 +5581,6 @@ static void beiscsi_eeh_resume(struct pci_dev *pdev)
pbe_eq = &phwi_context->be_eq[i]; pbe_eq = &phwi_context->be_eq[i];
irq_poll_init(&pbe_eq->iopoll, be_iopoll_budget, irq_poll_init(&pbe_eq->iopoll, be_iopoll_budget,
be_iopoll); be_iopoll);
irq_poll_enable(&pbe_eq->iopoll);
} }
i = (phba->msix_enabled) ? i : 0; 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]; pbe_eq = &phwi_context->be_eq[i];
irq_poll_init(&pbe_eq->iopoll, be_iopoll_budget, irq_poll_init(&pbe_eq->iopoll, be_iopoll_budget,
be_iopoll); be_iopoll);
irq_poll_enable(&pbe_eq->iopoll);
} }
i = (phba->msix_enabled) ? i : 0; i = (phba->msix_enabled) ? i : 0;

2
drivers/scsi/ipr.c
View File

@ -3708,7 +3708,6 @@ static ssize_t ipr_store_iopoll_weight(struct device *dev,
for (i = 1; i < ioa_cfg->hrrq_num; i++) { for (i = 1; i < ioa_cfg->hrrq_num; i++) {
irq_poll_init(&ioa_cfg->hrrq[i].iopoll, irq_poll_init(&ioa_cfg->hrrq[i].iopoll,
ioa_cfg->iopoll_weight, ipr_iopoll); ioa_cfg->iopoll_weight, ipr_iopoll);
irq_poll_enable(&ioa_cfg->hrrq[i].iopoll);
} }
} }
spin_unlock_irqrestore(shost->host_lock, lock_flags); 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++) { for (i = 1; i < ioa_cfg->hrrq_num; i++) {
irq_poll_init(&ioa_cfg->hrrq[i].iopoll, irq_poll_init(&ioa_cfg->hrrq[i].iopoll,
ioa_cfg->iopoll_weight, ipr_iopoll); ioa_cfg->iopoll_weight, ipr_iopoll);
irq_poll_enable(&ioa_cfg->hrrq[i].iopoll);
} }
} }

4
lib/irq_poll.c
View File

@ -170,8 +170,7 @@ EXPORT_SYMBOL(irq_poll_enable);
* @poll_fn: The handler to invoke * @poll_fn: The handler to invoke
* *
* Description: * Description:
* Initialize this irq_poll structure. Before being actively used, the * Initialize and enable this irq_poll structure.
* driver must call irq_poll_enable().
**/ **/
void irq_poll_init(struct irq_poll *iop, int weight, irq_poll_fn *poll_fn) 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); INIT_LIST_HEAD(&iop->list);
iop->weight = weight; iop->weight = weight;
iop->poll = poll_fn; iop->poll = poll_fn;
set_bit(IRQ_POLL_F_SCHED, &iop->state);
} }
EXPORT_SYMBOL(irq_poll_init); EXPORT_SYMBOL(irq_poll_init);