lkml.org 
[lkml]   [2013]   [Jan]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [PATCH 1/8 v2] staging/comedi: Add macro for registering a comedi PCMCIA driver
On 2013-01-14 21:00, Peter Huewe wrote:
> This patch introduces a new macro 'module_comedi_pcmcia_driver'
> for comedi PCMCIA drivers which do not do anything special in module
> init/exit. This eliminates a lot of boilerplate.
>
> Adapted from 'module_comedi_pci_driver'
>
> Signed-off-by: Peter Huewe <peterhuewe@gmx.de>
> ---
> v2:
> Removed unnecessary stuff. Thanks Hartley&Ian

This looks (and builds with and without PCMCIA support) fine. Thanks!

Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
(all 8 patches)

>
> drivers/staging/comedi/comedidev.h | 21 +++++++++++++++++++++
> drivers/staging/comedi/drivers.c | 32 ++++++++++++++++++++++++++++++++
> 2 files changed, 53 insertions(+), 0 deletions(-)
>
> diff --git a/drivers/staging/comedi/comedidev.h b/drivers/staging/comedi/comedidev.h
> index 34a85d3..d0248ed 100644
> --- a/drivers/staging/comedi/comedidev.h
> +++ b/drivers/staging/comedi/comedidev.h
> @@ -316,6 +316,27 @@ void comedi_pci_driver_unregister(struct comedi_driver *, struct 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 *,
> + 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))
> +
> struct usb_driver;
>
> int comedi_usb_driver_register(struct comedi_driver *, struct usb_driver *);
> diff --git a/drivers/staging/comedi/drivers.c b/drivers/staging/comedi/drivers.c
> index b67a0c9..bd9c678 100644
> --- a/drivers/staging/comedi/drivers.c
> +++ b/drivers/staging/comedi/drivers.c
> @@ -24,6 +24,8 @@
> #include <linux/device.h>
> #include <linux/module.h>
> #include <linux/pci.h>
> +#include <pcmcia/cistpl.h>
> +#include <pcmcia/ds.h>
> #include <linux/usb.h>
> #include <linux/errno.h>
> #include <linux/kconfig.h>
> @@ -954,6 +956,36 @@ void comedi_pci_driver_unregister(struct comedi_driver *comedi_driver,
> }
> EXPORT_SYMBOL_GPL(comedi_pci_driver_unregister);
>
> +#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
> +
> #if IS_ENABLED(CONFIG_USB)
>
> int comedi_usb_driver_register(struct comedi_driver *comedi_driver,
>


--
-=( Ian Abbott @ MEV Ltd. E-mail: <abbotti@mev.co.uk> )=-
-=( Tel: +44 (0)161 477 1898 FAX: +44 (0)161 718 3587 )=-


\
 
 \ /
  Last update: 2013-01-15 12:21    [W:0.070 / U:0.284 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site