]> Pileus Git - ~andy/linux/commitdiff
xen-pcifront: don't use flush_scheduled_work()
authorTejun Heo <tj@kernel.org>
Mon, 24 Jan 2011 14:43:03 +0000 (15:43 +0100)
committerKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Thu, 17 Feb 2011 21:18:45 +0000 (16:18 -0500)
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>
drivers/pci/xen-pcifront.c

index 3a5a6fcc0eada9305be0acd3e0a67e8348c85a62..030ce37434394329bd12cd90e3a689ac510885e0 100644 (file)
@@ -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);