Skip to content

Commit

Permalink
Staging: comedi: fix comedi_pci.h checkpatch.pl issues.
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Greg Kroah-Hartman committed Jan 6, 2009
1 parent 6d62a12 commit d72187b
Showing 1 changed file with 4 additions and 11 deletions.
15 changes: 4 additions & 11 deletions drivers/staging/comedi/drivers/comedi_pci.h
Original file line number Diff line number Diff line change
Expand Up @@ -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().
Expand All @@ -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
}

/*
Expand All @@ -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;
}

Expand Down

0 comments on commit d72187b

Please sign in to comment.