From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758855Ab3ANU77 (ORCPT ); Mon, 14 Jan 2013 15:59:59 -0500 Received: from mout.gmx.net ([212.227.17.20]:64647 "EHLO mout.gmx.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758638Ab3ANU6U (ORCPT ); Mon, 14 Jan 2013 15:58:20 -0500 X-Authenticated: #12255092 X-Provags-ID: V01U2FsdGVkX19hOFBmhuxhSCpuwtw6nwamp2ZOBUr5xG3OXSOoEQ lNSV3d2fCDKgwr From: Peter Huewe To: Greg Kroah-Hartman Cc: H Hartley Sweeten , Ian Abbott , Mori Hess , Peter Huewe , YAMANE Toshiaki , devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org Subject: [PATCH 2/8] staging/comedi/ni_daq_dio24: Convert to module_comedi_pcmcia_driver Date: Mon, 14 Jan 2013 22:00:49 +0100 Message-Id: <1358197255-17542-2-git-send-email-peterhuewe@gmx.de> X-Mailer: git-send-email 1.7.8.6 In-Reply-To: <1358197255-17542-1-git-send-email-peterhuewe@gmx.de> References: <1358197255-17542-1-git-send-email-peterhuewe@gmx.de> X-Y-GMX-Trusted: 0 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This patch removes the boring init/exit functions with the new module_comedi_pcmcia_driver macro. Signed-off-by: Peter Huewe --- drivers/staging/comedi/drivers/ni_daq_dio24.c | 29 +------------------------ 1 files changed, 1 insertions(+), 28 deletions(-) diff --git a/drivers/staging/comedi/drivers/ni_daq_dio24.c b/drivers/staging/comedi/drivers/ni_daq_dio24.c index 7b33335..dd22691 100644 --- a/drivers/staging/comedi/drivers/ni_daq_dio24.c +++ b/drivers/staging/comedi/drivers/ni_daq_dio24.c @@ -318,31 +318,4 @@ static struct pcmcia_driver dio24_cs_driver = { .name = "ni_daq_dio24", }; -static int __init init_dio24_cs(void) -{ - printk("ni_daq_dio24: HOLA SOY YO!\n"); - pcmcia_register_driver(&dio24_cs_driver); - return 0; -} - -static void __exit exit_dio24_cs(void) -{ - pcmcia_unregister_driver(&dio24_cs_driver); -} - -int __init init_module(void) -{ - int ret; - - ret = init_dio24_cs(); - if (ret < 0) - return ret; - - return comedi_driver_register(&driver_dio24); -} - -void __exit cleanup_module(void) -{ - exit_dio24_cs(); - comedi_driver_unregister(&driver_dio24); -} +module_comedi_pcmcia_driver(driver_dio24, dio24_cs_driver); -- 1.7.8.6