From: Greg Kroah-Hartman <gregkh@suse.de>
Date: Wed, 19 Nov 2008 21:55:14 +0000 (-0800)
Subject: Staging: comedi: fix comedi_pci.h checkpatch.pl issues.
X-Git-Tag: v2.6.29-rc1~228^2~52
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=d72187b7cd4bac8eb9f87cabbb8d537145dc4bad;p=linux-2.6-omap-h63xx.git

Staging: comedi: fix comedi_pci.h checkpatch.pl issues.

This resolves all the resolvable checkpatch.pl issues in the
comedi_pci.h file.

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 14078783915..0f32be8ff96 100644
--- a/drivers/staging/comedi/drivers/comedi_pci.h
+++ b/drivers/staging/comedi/drivers/comedi_pci.h
@@ -26,13 +26,8 @@
 #ifndef _COMEDI_PCI_H_
 #define _COMEDI_PCI_H_
 
-#include <linux/version.h>
 #include <linux/pci.h>
 
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,20)
-#define PCI_ENABLE_IS_REFCOUNTED
-#endif
-
 /*
  * Enables PCI device without requesting regions.  Just a simple wrapper
  * for pci_enable_device().
@@ -52,9 +47,7 @@ static inline int comedi_pci_enable_no_regions(struct pci_dev *pdev)
  */
 static inline void comedi_pci_disable_no_regions(struct pci_dev *pdev)
 {
-#ifdef PCI_ENABLE_IS_REFCOUNTED
 	pci_disable_device(pdev);
-#endif
 }
 
 /*
@@ -65,13 +58,13 @@ static inline int comedi_pci_enable(struct pci_dev *pdev, const char *res_name)
 	int rc;
 
 	rc = pci_enable_device(pdev);
-	if (rc < 0) {
+	if (rc < 0)
 		return rc;
-	}
+
 	rc = pci_request_regions(pdev, res_name);
-	if (rc < 0) {
+	if (rc < 0)
 		comedi_pci_disable_no_regions(pdev);
-	}
+
 	return rc;
 }