-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
staging: comedi: conditionally build in PCI driver support
Separate the comedi_pci_* functions out of drivers.c into a new source file, comedi_pci.c. This allows conditionally building support for comedi PCI drivers into the comedi core. Fix the Kconfig and Makefile appropriately. Group all the comedi_pci_* prototypes and related defines into one place in comedidev.h. Protect these prototypes with an #ifdef and provide some dummy functions so that the mixed ISA/PCI comedi drivers will still build correctly. Remove the #include <linux/pci.h> from comedidev.h and drivers.c. This include is only needed by the comedi PCI driver support code and the PCI drivers. The include should occur in those files. Also, remove the #include <linux/pci.h> from a couple non-PCI drivers since it's not needed. Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com> Cc: Ian Abbott <abbotti@mev.co.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
- Loading branch information
H Hartley Sweeten
authored and
Greg Kroah-Hartman
committed
Jan 31, 2013
1 parent
abac8b5
commit 33782dd
Showing
64 changed files
with
340 additions
and
161 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,140 @@ | ||
| /* | ||
| * comedi_pci.c | ||
| * Comedi PCI driver specific functions. | ||
| * | ||
| * COMEDI - Linux Control and Measurement Device Interface | ||
| * Copyright (C) 1997-2000 David A. Schleef <ds@schleef.org> | ||
| * | ||
| * This program is free software; you can redistribute it and/or modify | ||
| * it under the terms of the GNU General Public License as published by | ||
| * the Free Software Foundation; either version 2 of the License, or | ||
| * (at your option) any later version. | ||
| * | ||
| * This program is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| * GNU General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU General Public License | ||
| * along with this program; if not, write to the Free Software | ||
| * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. | ||
| */ | ||
|
|
||
| #include <linux/pci.h> | ||
|
|
||
| #include "comedidev.h" | ||
|
|
||
| /** | ||
| * comedi_to_pci_dev() - comedi_device pointer to pci_dev pointer. | ||
| * @dev: comedi_device struct | ||
| */ | ||
| struct pci_dev *comedi_to_pci_dev(struct comedi_device *dev) | ||
| { | ||
| return dev->hw_dev ? to_pci_dev(dev->hw_dev) : NULL; | ||
| } | ||
| EXPORT_SYMBOL_GPL(comedi_to_pci_dev); | ||
|
|
||
| /** | ||
| * comedi_pci_enable() - Enable the PCI device and request the regions. | ||
| * @pcidev: pci_dev struct | ||
| * @res_name: name for the requested reqource | ||
| */ | ||
| int comedi_pci_enable(struct pci_dev *pcidev, const char *res_name) | ||
| { | ||
| int rc; | ||
|
|
||
| rc = pci_enable_device(pcidev); | ||
| if (rc < 0) | ||
| return rc; | ||
|
|
||
| rc = pci_request_regions(pcidev, res_name); | ||
| if (rc < 0) | ||
| pci_disable_device(pcidev); | ||
|
|
||
| return rc; | ||
| } | ||
| EXPORT_SYMBOL_GPL(comedi_pci_enable); | ||
|
|
||
| /** | ||
| * comedi_pci_disable() - Release the regions and disable the PCI device. | ||
| * @pcidev: pci_dev struct | ||
| * | ||
| * This must be matched with a previous successful call to comedi_pci_enable(). | ||
| */ | ||
| void comedi_pci_disable(struct pci_dev *pcidev) | ||
| { | ||
| pci_release_regions(pcidev); | ||
| pci_disable_device(pcidev); | ||
| } | ||
| EXPORT_SYMBOL_GPL(comedi_pci_disable); | ||
|
|
||
| /** | ||
| * comedi_pci_auto_config() - Configure/probe a comedi PCI driver. | ||
| * @pcidev: pci_dev struct | ||
| * @driver: comedi_driver struct | ||
| * | ||
| * Typically called from the pci_driver (*probe) function. | ||
| */ | ||
| int comedi_pci_auto_config(struct pci_dev *pcidev, | ||
| struct comedi_driver *driver) | ||
| { | ||
| return comedi_auto_config(&pcidev->dev, driver, 0); | ||
| } | ||
| EXPORT_SYMBOL_GPL(comedi_pci_auto_config); | ||
|
|
||
| /** | ||
| * comedi_pci_auto_unconfig() - Unconfigure/remove a comedi PCI driver. | ||
| * @pcidev: pci_dev struct | ||
| * | ||
| * Typically called from the pci_driver (*remove) function. | ||
| */ | ||
| void comedi_pci_auto_unconfig(struct pci_dev *pcidev) | ||
| { | ||
| comedi_auto_unconfig(&pcidev->dev); | ||
| } | ||
| EXPORT_SYMBOL_GPL(comedi_pci_auto_unconfig); | ||
|
|
||
| /** | ||
| * comedi_pci_driver_register() - Register a comedi PCI driver. | ||
| * @comedi_driver: comedi_driver struct | ||
| * @pci_driver: pci_driver struct | ||
| * | ||
| * This function is used for the module_init() of comedi PCI drivers. | ||
| * Do not call it directly, use the module_comedi_pci_driver() helper | ||
| * macro instead. | ||
| */ | ||
| int comedi_pci_driver_register(struct comedi_driver *comedi_driver, | ||
| struct pci_driver *pci_driver) | ||
| { | ||
| int ret; | ||
|
|
||
| ret = comedi_driver_register(comedi_driver); | ||
| if (ret < 0) | ||
| return ret; | ||
|
|
||
| ret = pci_register_driver(pci_driver); | ||
| if (ret < 0) { | ||
| comedi_driver_unregister(comedi_driver); | ||
| return ret; | ||
| } | ||
|
|
||
| return 0; | ||
| } | ||
| EXPORT_SYMBOL_GPL(comedi_pci_driver_register); | ||
|
|
||
| /** | ||
| * comedi_pci_driver_unregister() - Unregister a comedi PCI driver. | ||
| * @comedi_driver: comedi_driver struct | ||
| * @pci_driver: pci_driver struct | ||
| * | ||
| * This function is used for the module_exit() of comedi PCI drivers. | ||
| * Do not call it directly, use the module_comedi_pci_driver() helper | ||
| * macro instead. | ||
| */ | ||
| void comedi_pci_driver_unregister(struct comedi_driver *comedi_driver, | ||
| struct pci_driver *pci_driver) | ||
| { | ||
| pci_unregister_driver(pci_driver); | ||
| comedi_driver_unregister(comedi_driver); | ||
| } | ||
| EXPORT_SYMBOL_GPL(comedi_pci_driver_unregister); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.