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

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

staging: comedi: conditionally build in PCMCIA driver support 



Separate the comedi_pcmcia_* functions out of drivers.c into a new
source file, comedi_pcmcia.c. This allows conditionally building
support for comedi pcmcia drivers into the comedi core without the
need for the #if'defery. Fix the Kconfig and Makefile appropriately.

Group all the comedi_pcmcia_* prototypes into one place in comedidev.h.
Protect these prototypes with an #ifdef so that building a comedi
pcmcia driver without PCMCIA support will cause a build error. This
will normally not happen as long as the comedi pcmcia driver is placed
in the proper group in the Kconfig.

Remove the #include <pcmcia/*.h> from drivers.c. These includes are only
needed by the comedi pcmcia driver support code and the pcmcia drivers.
The include should occur in those files.

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 33782dd5

drivers/staging/comedi/Kconfig

+1 −5
Original line number Diff line number Diff line
@@ -1090,11 +1090,7 @@ menuconfig COMEDI_PCMCIA_DRIVERS 
	bool "Comedi PCMCIA drivers"

	depends on PCMCIA

	---help---

	  Enable comedi PCMCIA and PCCARD 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 PCMCIA comedi drivers.

	  Enable support for comedi PCMCIA drivers.



if COMEDI_PCMCIA_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_PCMCIA_DRIVERS)	+= comedi_pcmcia.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_pcmcia.c

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

 * comedi_pcmcia.c

 * Comedi PCMCIA 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/kernel.h>



#include <pcmcia/cistpl.h>

#include <pcmcia/ds.h>



#include "comedidev.h"



/**

 * comedi_pcmcia_driver_register() - Register a comedi PCMCIA driver.

 * @comedi_driver: comedi_driver struct

 * @pcmcia_driver: pcmcia_driver struct

 *

 * This function is used for the module_init() of comedi USB drivers.

 * Do not call it directly, use the module_comedi_pcmcia_driver() helper

 * macro instead.

 */

int comedi_pcmcia_driver_register(struct comedi_driver *comedi_driver,

				  struct pcmcia_driver *pcmcia_driver)

{

	int ret;



	ret = comedi_driver_register(comedi_driver);

	if (ret < 0)

		return ret;



	ret = pcmcia_register_driver(pcmcia_driver);

	if (ret < 0) {

		comedi_driver_unregister(comedi_driver);

		return ret;

	}



	return 0;

}

EXPORT_SYMBOL_GPL(comedi_pcmcia_driver_register);



/**

 * comedi_pcmcia_driver_unregister() - Unregister a comedi PCMCIA driver.

 * @comedi_driver: comedi_driver struct

 * @pcmcia_driver: pcmcia_driver struct

 *

 * This function is used for the module_exit() of comedi PCMCIA drivers.

 * Do not call it directly, use the module_comedi_pcmcia_driver() helper

 * macro instead.

 */

void comedi_pcmcia_driver_unregister(struct comedi_driver *comedi_driver,

				     struct pcmcia_driver *pcmcia_driver)

{

	pcmcia_unregister_driver(pcmcia_driver);

	comedi_driver_unregister(comedi_driver);

}

EXPORT_SYMBOL_GPL(comedi_pcmcia_driver_unregister);

drivers/staging/comedi/comedidev.h

+27 −21
Original line number Diff line number Diff line
@@ -278,27 +278,6 @@ int comedi_driver_unregister(struct comedi_driver *); 
	module_driver(__comedi_driver, comedi_driver_register, \

			comedi_driver_unregister)



struct pcmcia_driver;



int comedi_pcmcia_driver_register(struct comedi_driver *,

					struct pcmcia_driver *);

void comedi_pcmcia_driver_unregister(struct comedi_driver *,

					struct pcmcia_driver *);



/**

 * module_comedi_pcmcia_driver() - Helper macro for registering a comedi PCMCIA driver

 * @__comedi_driver: comedi_driver struct

 * @__pcmcia_driver: pcmcia_driver struct

 *

 * Helper macro for comedi PCMCIA 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_pcmcia_driver(__comedi_driver, __pcmcia_driver) \

	module_driver(__comedi_driver, comedi_pcmcia_driver_register, \

			comedi_pcmcia_driver_unregister, &(__pcmcia_driver))



void init_polling(void);

void cleanup_polling(void);

void start_polling(struct comedi_device *);
@@ -481,6 +460,33 @@ static inline void comedi_pci_disable(struct pci_dev *dev) 


#endif /* CONFIG_COMEDI_PCI_DRIVERS */



#ifdef CONFIG_COMEDI_PCMCIA_DRIVERS



/* comedi_pcmcia.c - comedi PCMCIA driver specific functions */



struct pcmcia_driver;



int comedi_pcmcia_driver_register(struct comedi_driver *,

					struct pcmcia_driver *);

void comedi_pcmcia_driver_unregister(struct comedi_driver *,

					struct pcmcia_driver *);



/**

 * module_comedi_pcmcia_driver() - Helper macro for registering a comedi PCMCIA driver

 * @__comedi_driver: comedi_driver struct

 * @__pcmcia_driver: pcmcia_driver struct

 *

 * Helper macro for comedi PCMCIA 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_pcmcia_driver(__comedi_driver, __pcmcia_driver) \

	module_driver(__comedi_driver, comedi_pcmcia_driver_register, \

			comedi_pcmcia_driver_unregister, &(__pcmcia_driver))



#endif /* CONFIG_COMEDI_PCMCIA_DRIVERS */



#ifdef CONFIG_COMEDI_USB_DRIVERS



/* comedi_usb.c - comedi USB driver specific functions */

drivers/staging/comedi/drivers.c

+0 −32
Original line number Diff line number Diff line
@@ -23,8 +23,6 @@ 


#include <linux/device.h>

#include <linux/module.h>

#include <pcmcia/cistpl.h>

#include <pcmcia/ds.h>

#include <linux/errno.h>

#include <linux/kconfig.h>

#include <linux/kernel.h>
@@ -494,33 +492,3 @@ void comedi_auto_unconfig(struct device *hardware_device) 
	comedi_free_board_minor(minor);

}

EXPORT_SYMBOL_GPL(comedi_auto_unconfig);
 


#if IS_ENABLED(CONFIG_PCMCIA)

int comedi_pcmcia_driver_register(struct comedi_driver *comedi_driver,

		struct pcmcia_driver *pcmcia_driver)

{

	int ret;



	ret = comedi_driver_register(comedi_driver);

	if (ret < 0)

		return ret;



	ret = pcmcia_register_driver(pcmcia_driver);

	if (ret < 0) {

		comedi_driver_unregister(comedi_driver);

		return ret;

	}



	return 0;

}

EXPORT_SYMBOL_GPL(comedi_pcmcia_driver_register);



void comedi_pcmcia_driver_unregister(struct comedi_driver *comedi_driver,

		struct pcmcia_driver *pcmcia_driver)

{

	pcmcia_unregister_driver(pcmcia_driver);

	comedi_driver_unregister(comedi_driver);

}

EXPORT_SYMBOL_GPL(comedi_pcmcia_driver_unregister);



#endif