diff options
| author | Tejun Heo <tj@kernel.org> | 2011-01-24 15:43:03 +0100 |
|---|---|---|
| committer | Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> | 2011-02-17 22:18:45 +0100 |
| commit | db2e2e6ee9ee9ce93b04c6975fdfef304771d6ad (patch) | |
| tree | 7552b1e19f5457d07dc9c209b8ba305a3bfa4c78 /drivers/pci/xen-pcifront.c | |
| parent | Linux 2.6.38-rc5 (diff) | |
| download | linux-db2e2e6ee9ee9ce93b04c6975fdfef304771d6ad.tar.xz linux-db2e2e6ee9ee9ce93b04c6975fdfef304771d6ad.zip | |
xen-pcifront: don't use flush_scheduled_work()
flush_scheduled_work() is scheduled for deprecation. Cancel ->op_work
directly instead.
Signed-off-by: Tejun Heo <tj@kernel.org>
Cc: Ryan Wilson <hap9@epoch.ncsc.mil>
Cc: Jan Beulich <JBeulich@novell.com>
Cc: Jesse Barnes <jbarnes@virtuousgeek.org>
Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Diffstat (limited to 'drivers/pci/xen-pcifront.c')
| -rw-r--r-- | drivers/pci/xen-pcifront.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/pci/xen-pcifront.c b/drivers/pci/xen-pcifront.c index 3a5a6fcc0ead..030ce3743439 100644 --- a/drivers/pci/xen-pcifront.c +++ b/drivers/pci/xen-pcifront.c @@ -733,8 +733,7 @@ static void free_pdev(struct pcifront_device *pdev) pcifront_free_roots(pdev); - /*For PCIE_AER error handling job*/ - flush_scheduled_work(); + cancel_work_sync(&pdev->op_work); if (pdev->irq >= 0) unbind_from_irqhandler(pdev->irq, pdev); |