Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 33782dd5 authored by H Hartley Sweeten's avatar H Hartley Sweeten Committed by Greg Kroah-Hartman
Browse files

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: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent abac8b54

drivers/staging/comedi/Kconfig

+1 −5
Original line number Diff line number Diff line
@@ -542,11 +542,7 @@ menuconfig COMEDI_PCI_DRIVERS 
	bool "Comedi PCI drivers"

	depends on PCI

	---help---

	  Enable comedi PCI drivers to be built



	  Note that the answer to this question won't directly affect the

	  kernel: saying N will just cause the configurator to skip all

	  the questions about PCI comedi drivers.

	  Enable support for comedi PCI drivers.



if COMEDI_PCI_DRIVERS

drivers/staging/comedi/Makefile

+1 −0
Original line number Diff line number Diff line 
comedi-y				:= comedi_fops.o range.o drivers.o \

					   comedi_buf.o

comedi-$(CONFIG_COMEDI_PCI_DRIVERS)	+= comedi_pci.o

comedi-$(CONFIG_COMEDI_USB_DRIVERS)	+= comedi_usb.o

comedi-$(CONFIG_PROC_FS)		+= proc.o

comedi-$(CONFIG_COMPAT)			+= comedi_compat32.o

drivers/staging/comedi/comedi_pci.c

0 → 100644
+140 −0
Original line number Diff line number Diff line 
/*

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

drivers/staging/comedi/comedidev.h

+68 −46
Original line number Diff line number Diff line
@@ -40,7 +40,6 @@ 
#include <linux/uaccess.h>

#include <linux/io.h>

#include <linux/timer.h>

#include <linux/pci.h>



#include "comedi.h"
@@ -54,22 +53,6 @@ 
	COMEDI_MINORVERSION, COMEDI_MICROVERSION)

#define COMEDI_RELEASE VERSION



/*

 * PCI Vendor IDs not in <linux/pci_ids.h>

 */

#define PCI_VENDOR_ID_KOLTER		0x1001

#define PCI_VENDOR_ID_ICP		0x104c

#define PCI_VENDOR_ID_AMCC		0x10e8

#define PCI_VENDOR_ID_DT		0x1116

#define PCI_VENDOR_ID_IOTECH		0x1616

#define PCI_VENDOR_ID_CONTEC		0x1221

#define PCI_VENDOR_ID_CB		0x1307	/* Measurement Computing */

#define PCI_VENDOR_ID_ADVANTECH		0x13fe

#define PCI_VENDOR_ID_MEILHAUS		0x1402

#define PCI_VENDOR_ID_RTD		0x1435

#define PCI_VENDOR_ID_ADLINK		0x144a

#define PCI_VENDOR_ID_AMPLICON		0x14dc



#define COMEDI_NUM_MINORS 0x100

#define COMEDI_NUM_BOARD_MINORS 0x30

#define COMEDI_FIRST_SUBDEVICE_MINOR COMEDI_NUM_BOARD_MINORS
@@ -295,26 +278,6 @@ int comedi_driver_unregister(struct comedi_driver *); 
	module_driver(__comedi_driver, comedi_driver_register, \

			comedi_driver_unregister)



int comedi_pci_enable(struct pci_dev *, const char *);

void comedi_pci_disable(struct pci_dev *);



int comedi_pci_driver_register(struct comedi_driver *, struct pci_driver *);

void comedi_pci_driver_unregister(struct comedi_driver *, struct pci_driver *);



/**

 * module_comedi_pci_driver() - Helper macro for registering a comedi PCI driver

 * @__comedi_driver: comedi_driver struct

 * @__pci_driver: pci_driver struct

 *

 * Helper macro for comedi PCI drivers which do not do anything special

 * in module init/exit. This eliminates a lot of boilerplate. Each

 * module may only use this macro once, and calling it replaces

 * module_init() and module_exit()

 */

#define module_comedi_pci_driver(__comedi_driver, __pci_driver) \

	module_driver(__comedi_driver, comedi_pci_driver_register, \

			comedi_pci_driver_unregister, &(__pci_driver))



struct pcmcia_driver;



int comedi_pcmcia_driver_register(struct comedi_driver *,
@@ -424,11 +387,6 @@ static inline void comedi_set_hw_dev(struct comedi_device *dev, 
	put_device(old_hw_dev);

}



static inline struct pci_dev *comedi_to_pci_dev(struct comedi_device *dev)

{

	return dev->hw_dev ? to_pci_dev(dev->hw_dev) : NULL;

}



unsigned int comedi_buf_write_alloc(struct comedi_async *, unsigned int);

unsigned int comedi_buf_write_free(struct comedi_async *, unsigned int);
@@ -451,13 +409,77 @@ int comedi_auto_config(struct device *hardware_device, 
		       struct comedi_driver *driver, unsigned long context);

void comedi_auto_unconfig(struct device *hardware_device);



static inline int comedi_pci_auto_config(struct pci_dev *pcidev,

					 struct comedi_driver *driver)

#ifdef CONFIG_COMEDI_PCI_DRIVERS



/* comedi_pci.c - comedi PCI driver specific functions */



/*

 * PCI Vendor IDs not in <linux/pci_ids.h>

 */

#define PCI_VENDOR_ID_KOLTER		0x1001

#define PCI_VENDOR_ID_ICP		0x104c

#define PCI_VENDOR_ID_AMCC		0x10e8

#define PCI_VENDOR_ID_DT		0x1116

#define PCI_VENDOR_ID_IOTECH		0x1616

#define PCI_VENDOR_ID_CONTEC		0x1221

#define PCI_VENDOR_ID_CB		0x1307	/* Measurement Computing */

#define PCI_VENDOR_ID_ADVANTECH		0x13fe

#define PCI_VENDOR_ID_MEILHAUS		0x1402

#define PCI_VENDOR_ID_RTD		0x1435

#define PCI_VENDOR_ID_ADLINK		0x144a

#define PCI_VENDOR_ID_AMPLICON		0x14dc



struct pci_dev;

struct pci_driver;



struct pci_dev *comedi_to_pci_dev(struct comedi_device *);



int comedi_pci_enable(struct pci_dev *, const char *);

void comedi_pci_disable(struct pci_dev *);



int comedi_pci_auto_config(struct pci_dev *, struct comedi_driver *);

void comedi_pci_auto_unconfig(struct pci_dev *);



int comedi_pci_driver_register(struct comedi_driver *, struct pci_driver *);

void comedi_pci_driver_unregister(struct comedi_driver *, struct pci_driver *);



/**

 * module_comedi_pci_driver() - Helper macro for registering a comedi PCI driver

 * @__comedi_driver: comedi_driver struct

 * @__pci_driver: pci_driver struct

 *

 * Helper macro for comedi PCI drivers which do not do anything special

 * in module init/exit. This eliminates a lot of boilerplate. Each

 * module may only use this macro once, and calling it replaces

 * module_init() and module_exit()

 */

#define module_comedi_pci_driver(__comedi_driver, __pci_driver) \

	module_driver(__comedi_driver, comedi_pci_driver_register, \

			comedi_pci_driver_unregister, &(__pci_driver))



#else



/*

 * Some of the comedi mixed ISA/PCI drivers call the PCI specific

 * functions. Provide some dummy functions if CONFIG_COMEDI_PCI_DRIVERS

 * is not enabled.

 */



static inline struct pci_dev *comedi_to_pci_dev(struct comedi_device *dev)

{

	return NULL;

}



static inline int comedi_pci_enable(struct pci_dev *dev, const char *name)

{

	return -ENOSYS;

}



static inline void comedi_pci_disable(struct pci_dev *dev)

{

	return comedi_auto_config(&pcidev->dev, driver, 0);

}



void comedi_pci_auto_unconfig(struct pci_dev *pcidev);

#endif /* CONFIG_COMEDI_PCI_DRIVERS */



#ifdef CONFIG_COMEDI_USB_DRIVERS

drivers/staging/comedi/drivers.c

+0 −68
Original line number Diff line number Diff line
@@ -23,7 +23,6 @@ 


#include <linux/device.h>

#include <linux/module.h>

#include <linux/pci.h>

#include <pcmcia/cistpl.h>

#include <pcmcia/ds.h>

#include <linux/errno.h>
@@ -496,73 +495,6 @@ void comedi_auto_unconfig(struct device *hardware_device) 
}

EXPORT_SYMBOL_GPL(comedi_auto_unconfig);



/**

 * comedi_pci_enable() - Enable the PCI device and request the regions.

 * @pdev: pci_dev struct

 * @res_name: name for the requested reqource

 */

int comedi_pci_enable(struct pci_dev *pdev, const char *res_name)

{

	int rc;



	rc = pci_enable_device(pdev);

	if (rc < 0)

		return rc;



	rc = pci_request_regions(pdev, res_name);

	if (rc < 0)

		pci_disable_device(pdev);



	return rc;

}

EXPORT_SYMBOL_GPL(comedi_pci_enable);



/**

 * comedi_pci_disable() - Release the regions and disable the PCI device.

 * @pdev: pci_dev struct

 *

 * This must be matched with a previous successful call to comedi_pci_enable().

 */

void comedi_pci_disable(struct pci_dev *pdev)

{

	pci_release_regions(pdev);

	pci_disable_device(pdev);

}

EXPORT_SYMBOL_GPL(comedi_pci_disable);



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



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



void comedi_pci_auto_unconfig(struct pci_dev *pcidev)

{

	comedi_auto_unconfig(&pcidev->dev);

}

EXPORT_SYMBOL_GPL(comedi_pci_auto_unconfig);



#if IS_ENABLED(CONFIG_PCMCIA)

int comedi_pcmcia_driver_register(struct comedi_driver *comedi_driver,

		struct pcmcia_driver *pcmcia_driver)