From: Tejun Heo <tj@kernel.org>
Date: Mon, 24 Jan 2011 14:43:03 +0000 (+0100)
Subject: xen-pcifront: don't use flush_scheduled_work()
X-Git-Tag: android-x86-4.4-r1~6937^3~4
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=db2e2e6ee9ee9ce93b04c6975fdfef304771d6ad;p=android-x86%2Fkernel.git

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>
---

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);