Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756255Ab2FVXOm (ORCPT ); Fri, 22 Jun 2012 19:14:42 -0400 Received: from mail132.messagelabs.com ([216.82.242.115]:16902 "EHLO mail132.messagelabs.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751972Ab2FVXOk (ORCPT ); Fri, 22 Jun 2012 19:14:40 -0400 X-Env-Sender: hartleys@visionengravers.com X-Msg-Ref: server-10.tower-132.messagelabs.com!1340406877!12252875!1 X-Originating-IP: [216.166.12.178] X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked From: H Hartley Sweeten To: Linux Kernel Subject: [PATCH 04/31] staging: comedi: ni_daq_700: consolidate the init and exit functions Date: Fri, 22 Jun 2012 16:14:30 -0700 User-Agent: KMail/1.9.9 CC: , , , MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Content-Disposition: inline Message-ID: <201206221614.30744.hartleys@visionengravers.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1783 Lines: 59 The register/unregister of the pcmcia driver is done is separate functions that are called by the module_{init,exit} routines. Simplify the code a bit by moving the register/unregister into the module_{init,exit} routines. Signed-off-by: H Hartley Sweeten Cc: Ian Abbott Cc: Frank Mori Hess Cc: Greg Kroah-hartman --- drivers/staging/comedi/drivers/ni_daq_700.c | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/drivers/staging/comedi/drivers/ni_daq_700.c b/drivers/staging/comedi/drivers/ni_daq_700.c index 052a051..b06792b 100644 --- a/drivers/staging/comedi/drivers/ni_daq_700.c +++ b/drivers/staging/comedi/drivers/ni_daq_700.c @@ -439,23 +439,11 @@ static struct pcmcia_driver dio700_cs_driver = { .name = "ni_daq_700", }; -static int __init init_dio700_cs(void) -{ - pcmcia_register_driver(&dio700_cs_driver); - return 0; -} - -static void __exit exit_dio700_cs(void) -{ - pr_debug("ni_daq_700: unloading\n"); - pcmcia_unregister_driver(&dio700_cs_driver); -} - static int __init dio700_cs_init(void) { int ret; - ret = init_dio700_cs(); + ret = pcmcia_register_driver(&dio700_cs_driver); if (ret < 0) return ret; @@ -465,7 +453,7 @@ module_init(dio700_cs_init); static void __exit dio700_cs_exit(void) { - exit_dio700_cs(); + pcmcia_unregister_driver(&dio700_cs_driver); comedi_driver_unregister(&driver_dio700); } module_exit(dio700_cs_exit); -- 1.7.11 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/