mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Peter Huewe <peterhuewe@gmx.de>
To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: H Hartley Sweeten <hsweeten@visionengravers.com>,
	Ian Abbott <abbotti@mev.co.uk>,
	Mori Hess <fmhess@users.sourceforge.net>,
	Peter Huewe <peterhuewe@gmx.de>,
	YAMANE Toshiaki <yamanetoshi@gmail.com>,
	devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org
Subject: [PATCH 3/8] staging/comedi/ni_mio_cs: Convert to module_comedi_pcmcia_driver
Date: Mon, 14 Jan 2013 22:00:50 +0100	[thread overview]
Message-ID: <1358197255-17542-3-git-send-email-peterhuewe@gmx.de> (raw)
In-Reply-To: <1358197255-17542-1-git-send-email-peterhuewe@gmx.de>

This patch removes the boring init/exit functions with the new
module_comedi_pcmcia_driver macro.

Also removed the superflous #ifdef MODULE

Signed-off-by: Peter Huewe <peterhuewe@gmx.de>
---
 drivers/staging/comedi/drivers/ni_mio_cs.c |   20 +-------------------
 1 files changed, 1 insertions(+), 19 deletions(-)

diff --git a/drivers/staging/comedi/drivers/ni_mio_cs.c b/drivers/staging/comedi/drivers/ni_mio_cs.c
index 76c6a13..b5c5d58 100644
--- a/drivers/staging/comedi/drivers/ni_mio_cs.c
+++ b/drivers/staging/comedi/drivers/ni_mio_cs.c
@@ -408,8 +408,6 @@ static int ni_getboardtype(struct comedi_device *dev,
 	return 0;
 }
 
-#ifdef MODULE
-
 static const struct pcmcia_device_id ni_mio_cs_ids[] = {
 	PCMCIA_DEVICE_MANF_CARD(0x010b, 0x010d),	/* DAQCard-ai-16xe-50 */
 	PCMCIA_DEVICE_MANF_CARD(0x010b, 0x010c),	/* DAQCard-ai-16e-4 */
@@ -434,20 +432,4 @@ static struct pcmcia_driver ni_mio_cs_driver = {
 	.name = "ni_mio_cs",
 };
 
-int init_module(void)
-{
-	pcmcia_register_driver(&ni_mio_cs_driver);
-	comedi_driver_register(&driver_ni_mio_cs);
-	return 0;
-}
-
-void cleanup_module(void)
-{
-	pcmcia_unregister_driver(&ni_mio_cs_driver);
-#if 0
-	while (cur_dev != NULL)
-		cs_detach(cur_dev->handle);
-#endif
-	comedi_driver_unregister(&driver_ni_mio_cs);
-}
-#endif
+module_comedi_pcmcia_driver(driver_ni_mio_cs, ni_mio_cs_driver);
-- 
1.7.8.6


  parent reply	other threads:[~2013-01-14 20:58 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
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     ` Peter Huewe [this message]
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

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1358197255-17542-3-git-send-email-peterhuewe@gmx.de \
    --to=peterhuewe@gmx.de \
    --cc=abbotti@mev.co.uk \
    --cc=devel@driverdev.osuosl.org \
    --cc=fmhess@users.sourceforge.net \
    --cc=gregkh@linuxfoundation.org \
    --cc=hsweeten@visionengravers.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=yamanetoshi@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®