All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH 1/8] staging/comedi: Add macro for registering a comedi PCMCIA driver
@ 2013-01-13  2:11 Peter Huewe
  2013-01-13  2:11 ` [PATCH 2/8] staging/comedi/ni_daq_dio24: Convert to module_comedi_pcmcia_driver Peter Huewe
                   ` (8 more replies)
  0 siblings, 9 replies; 19+ messages in thread
From: Peter Huewe @ 2013-01-13  2:11 UTC (permalink / raw)
  To: Greg Kroah-Hartman
  Cc: H Hartley Sweeten, Ian Abbott, Mori Hess, Peter Huewe,
	YAMANE Toshiaki, devel, linux-kernel

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>
---
 drivers/staging/comedi/comedidev.h |   22 ++++++++++++++++++++++
 drivers/staging/comedi/drivers.c   |   34 ++++++++++++++++++++++++++++++++++
 2 files changed, 56 insertions(+), 0 deletions(-)

diff --git a/drivers/staging/comedi/comedidev.h b/drivers/staging/comedi/comedidev.h
index 692e1e6..ccb22dd 100644
--- a/drivers/staging/comedi/comedidev.h
+++ b/drivers/staging/comedi/comedidev.h
@@ -41,6 +41,9 @@
 #include <linux/io.h>
 #include <linux/timer.h>
 #include <linux/pci.h>
+#include <pcmcia/cistpl.h>
+#include <pcmcia/cisreg.h>
+#include <pcmcia/ds.h>
 #include <linux/usb.h>
 
 #include "comedi.h"
@@ -342,6 +345,25 @@ 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))
 
+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 50cf498..17a9e35 100644
--- a/drivers/staging/comedi/drivers.c
+++ b/drivers/staging/comedi/drivers.c
@@ -24,6 +24,9 @@
 #include <linux/device.h>
 #include <linux/module.h>
 #include <linux/pci.h>
+#include <pcmcia/cistpl.h>
+#include <pcmcia/cisreg.h>
+#include <pcmcia/ds.h>
 #include <linux/usb.h>
 #include <linux/errno.h>
 #include <linux/kconfig.h>
@@ -958,6 +961,37 @@ void comedi_pci_driver_unregister(struct comedi_driver *comedi_driver,
 }
 EXPORT_SYMBOL_GPL(comedi_pci_driver_unregister);
 
+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;
+
+	/* FIXME: Remove this test after auditing all comedi pci drivers */
+	if (!pcmcia_driver->name)
+		pcmcia_driver->name = comedi_driver->driver_name;
+
+	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);
+
 #if IS_ENABLED(CONFIG_USB)
 
 int comedi_usb_driver_register(struct comedi_driver *comedi_driver,
-- 
1.7.8.6


^ permalink raw reply related	[flat|nested] 19+ messages in thread
end of thread, other threads:[~2013-01-15 10:36 UTC | newest]

Thread overview: 19+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-01-13  2:11 [PATCH 1/8] staging/comedi: Add macro for registering a comedi PCMCIA driver Peter Huewe
2013-01-13  2:11 ` [PATCH 2/8] staging/comedi/ni_daq_dio24: Convert to module_comedi_pcmcia_driver Peter Huewe
2013-01-13  2:11 ` [PATCH 3/8] staging/comedi/ni_mio_cs: " Peter Huewe
2013-01-13  2:11 ` [PATCH 4/8] staging/comedi/quatech_daqp_cs: " Peter Huewe
2013-01-13  2:11 ` [PATCH 5/8] staging/comedi/cb_das16_cs: " Peter Huewe
2013-01-13  2:11 ` [PATCH 6/8] staging/comedi/das08_cs: " Peter Huewe
2013-01-13  2:11 ` [PATCH 7/8] staging/comedi/ni_daq_700: " Peter Huewe
2013-01-13  2:11 ` [PATCH 8/8] staging/comedi/ni_labpc_cs: " Peter Huewe
2013-01-14 11:19 ` [PATCH 1/8] staging/comedi: Add macro for registering a comedi PCMCIA driver Ian Abbott
2013-01-14 16:44 ` H Hartley Sweeten
2013-01-14 21:00   ` [PATCH 1/8 v2] " Peter Huewe
2013-01-14 21:00     ` [PATCH 2/8] staging/comedi/ni_daq_dio24: Convert to module_comedi_pcmcia_driver Peter Huewe
2013-01-14 21:00     ` [PATCH 3/8] staging/comedi/ni_mio_cs: " Peter Huewe
2013-01-14 21:00     ` [PATCH 4/8] staging/comedi/quatech_daqp_cs: " Peter Huewe
2013-01-14 21:00     ` [PATCH 5/8] staging/comedi/cb_das16_cs: " Peter Huewe
2013-01-14 21:00     ` [PATCH 6/8] staging/comedi/das08_cs: " Peter Huewe
2013-01-14 21:00     ` [PATCH 7/8] staging/comedi/ni_daq_700: " Peter Huewe
2013-01-14 21:00     ` [PATCH 8/8] staging/comedi/ni_labpc_cs: " Peter Huewe
2013-01-15 10:36     ` [PATCH 1/8 v2] staging/comedi: Add macro for registering a comedi PCMCIA driver Ian Abbott

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.