From: Greg Kroah-Hartman <gregkh@suse.de>
Date: Wed, 19 Nov 2008 21:57:34 +0000 (-0800)
Subject: Staging: comedi: comedi_pci.h: remove unneeded wrapper
X-Git-Tag: v2.6.29-rc1~228^2~51
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=5604ec6fb65ba388b698d8490f797267470b8b23;p=linux-2.6-omap-h63xx.git

Staging: comedi: comedi_pci.h: remove unneeded wrapper

just call pci_disable_device() directly in comedi_pci_enable()
as no wrapper is needed now that we are in the kernel tree.

Cc: David Schleef <ds@schleef.org>
Cc: Frank Mori Hess <fmhess@users.sourceforge.net>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---

diff --git a/drivers/staging/comedi/drivers/comedi_pci.h b/drivers/staging/comedi/drivers/comedi_pci.h
index 0f32be8ff96..5475941dadc 100644
--- a/drivers/staging/comedi/drivers/comedi_pci.h
+++ b/drivers/staging/comedi/drivers/comedi_pci.h
@@ -63,7 +63,7 @@ static inline int comedi_pci_enable(struct pci_dev *pdev, const char *res_name)
 
 	rc = pci_request_regions(pdev, res_name);
 	if (rc < 0)
-		comedi_pci_disable_no_regions(pdev);
+		pci_disable_device(pdev);
 
 	return rc;
 }