From patchwork Fri Jan 20 00:16:32 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Axel Lin X-Patchwork-Id: 136927 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from mail-gy0-f184.google.com (mail-gy0-f184.google.com [209.85.160.184]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority" (not verified)) by ozlabs.org (Postfix) with ESMTPS id C4988B6F68 for ; Fri, 20 Jan 2012 11:17:01 +1100 (EST) Received: by ghbg2 with SMTP id g2sf4222ghb.11 for ; Thu, 19 Jan 2012 16:16:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=beta; h=x-beenthere:received-spf:message-id:subject:from:to:cc:date :x-mailer:mime-version:x-original-sender :x-original-authentication-results:reply-to:precedence:mailing-list :list-id:x-google-group-id:list-post:list-help:list-archive:sender :list-subscribe:list-unsubscribe:content-type; bh=RSoPd10mwLpmjczrYV+ZCe1Ra1BE/zFl/3UDARfSbsI=; b=XJjaL0s1rDyME7Ev5VfIsUqGlv+1DAz0RIrftpZKnED+OTIQsMJKSNtzb3bnxE4wJf PTt/3n3aRvvjkMnGjRiPjO3c3sD2E/7oqweOfueF+s4J8S/FH+whFxVM1bF4jNEZVeVw ALOCFddjhV/fvcACbF96nt6k/btpCzDhz33WA= Received: by 10.236.176.133 with SMTP id b5mr2969430yhm.9.1327018606686; Thu, 19 Jan 2012 16:16:46 -0800 (PST) X-BeenThere: rtc-linux@googlegroups.com Received: by 10.101.163.17 with SMTP id q17ls414533ano.5.gmail; Thu, 19 Jan 2012 16:16:46 -0800 (PST) Received: by 10.101.53.15 with SMTP id f15mr1905754ank.25.1327018606186; Thu, 19 Jan 2012 16:16:46 -0800 (PST) Received: by 10.101.53.15 with SMTP id f15mr1905752ank.25.1327018606170; Thu, 19 Jan 2012 16:16:46 -0800 (PST) Received: from mail-gx0-f182.google.com (mail-gx0-f182.google.com [209.85.161.182]) by gmr-mx.google.com with ESMTPS id o69si541891yhn.2.2012.01.19.16.16.46 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 19 Jan 2012 16:16:46 -0800 (PST) Received-SPF: pass (google.com: domain of axel.lin@gmail.com designates 209.85.161.182 as permitted sender) client-ip=209.85.161.182; Received: by mail-gx0-f182.google.com with SMTP id i1so10721ggk.27 for ; Thu, 19 Jan 2012 16:16:46 -0800 (PST) Received: by 10.101.22.16 with SMTP id z16mr2174884ani.55.1327018606060; Thu, 19 Jan 2012 16:16:46 -0800 (PST) Received: from [218.172.235.251] (218-172-235-251.dynamic.hinet.net. [218.172.235.251]) by mx.google.com with ESMTPS id n24sm1933456yhj.13.2012.01.19.16.16.40 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 19 Jan 2012 16:16:44 -0800 (PST) Message-ID: <1327018592.7293.1.camel@phoenix> Subject: [rtc-linux] [PATCH 1/2] rtc: Convert rtc spi drivers to module_spi_driver From: Axel Lin To: linux-kernel@vger.kernel.org Cc: Mark Jackson , Dennis Aberilla , Nikolaus Voss , "Kim B. Heino" , Raphael Assenat , Chris Verges , Magnus Damm , Atsushi Nemoto , Alessandro Zummo , Andrew Morton , rtc-linux@googlegroups.com Date: Fri, 20 Jan 2012 08:16:32 +0800 X-Mailer: Evolution 3.2.1- Mime-Version: 1.0 X-Original-Sender: axel.lin@gmail.com X-Original-Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of axel.lin@gmail.com designates 209.85.161.182 as permitted sender) smtp.mail=axel.lin@gmail.com; dkim=pass header.i=@gmail.com Reply-To: rtc-linux@googlegroups.com Precedence: list Mailing-list: list rtc-linux@googlegroups.com; contact rtc-linux+owners@googlegroups.com List-ID: X-Google-Group-Id: 712029733259 List-Post: , List-Help: , List-Archive: Sender: rtc-linux@googlegroups.com List-Subscribe: , List-Unsubscribe: , Factor out some boilerplate code for spi driver registration into module_spi_driver. Signed-off-by: Axel Lin Cc: Mark Jackson Cc: Dennis Aberilla Cc: Nikolaus Voss Cc: "Kim B. Heino" Cc: Raphael Assenat Cc: Chris Verges Cc: Magnus Damm Cc: Atsushi Nemoto --- drivers/rtc/rtc-ds1305.c | 12 +----------- drivers/rtc/rtc-ds1390.c | 12 +----------- drivers/rtc/rtc-ds3234.c | 12 +----------- drivers/rtc/rtc-m41t93.c | 12 +----------- drivers/rtc/rtc-m41t94.c | 14 +------------- drivers/rtc/rtc-max6902.c | 12 +----------- drivers/rtc/rtc-pcf2123.c | 13 +------------ drivers/rtc/rtc-r9701.c | 12 +----------- drivers/rtc/rtc-rs5c348.c | 13 +------------ 9 files changed, 9 insertions(+), 103 deletions(-) diff --git a/drivers/rtc/rtc-ds1305.c b/drivers/rtc/rtc-ds1305.c index 3a33b1f..686a865 100644 --- a/drivers/rtc/rtc-ds1305.c +++ b/drivers/rtc/rtc-ds1305.c @@ -814,17 +814,7 @@ static struct spi_driver ds1305_driver = { /* REVISIT add suspend/resume */ }; -static int __init ds1305_init(void) -{ - return spi_register_driver(&ds1305_driver); -} -module_init(ds1305_init); - -static void __exit ds1305_exit(void) -{ - spi_unregister_driver(&ds1305_driver); -} -module_exit(ds1305_exit); +module_spi_driver(ds1305_driver); MODULE_DESCRIPTION("RTC driver for DS1305 and DS1306 chips"); MODULE_LICENSE("GPL"); diff --git a/drivers/rtc/rtc-ds1390.c b/drivers/rtc/rtc-ds1390.c index b038d2c..b0a99e1 100644 --- a/drivers/rtc/rtc-ds1390.c +++ b/drivers/rtc/rtc-ds1390.c @@ -175,17 +175,7 @@ static struct spi_driver ds1390_driver = { .remove = __devexit_p(ds1390_remove), }; -static __init int ds1390_init(void) -{ - return spi_register_driver(&ds1390_driver); -} -module_init(ds1390_init); - -static __exit void ds1390_exit(void) -{ - spi_unregister_driver(&ds1390_driver); -} -module_exit(ds1390_exit); +module_spi_driver(ds1390_driver); MODULE_DESCRIPTION("Dallas/Maxim DS1390/93/94 SPI RTC driver"); MODULE_AUTHOR("Mark Jackson "); diff --git a/drivers/rtc/rtc-ds3234.c b/drivers/rtc/rtc-ds3234.c index bbd2622..fda7079 100644 --- a/drivers/rtc/rtc-ds3234.c +++ b/drivers/rtc/rtc-ds3234.c @@ -173,17 +173,7 @@ static struct spi_driver ds3234_driver = { .remove = __devexit_p(ds3234_remove), }; -static __init int ds3234_init(void) -{ - return spi_register_driver(&ds3234_driver); -} -module_init(ds3234_init); - -static __exit void ds3234_exit(void) -{ - spi_unregister_driver(&ds3234_driver); -} -module_exit(ds3234_exit); +module_spi_driver(ds3234_driver); MODULE_DESCRIPTION("DS3234 SPI RTC driver"); MODULE_AUTHOR("Dennis Aberilla "); diff --git a/drivers/rtc/rtc-m41t93.c b/drivers/rtc/rtc-m41t93.c index ef71132..10f1c29 100644 --- a/drivers/rtc/rtc-m41t93.c +++ b/drivers/rtc/rtc-m41t93.c @@ -206,17 +206,7 @@ static struct spi_driver m41t93_driver = { .remove = __devexit_p(m41t93_remove), }; -static __init int m41t93_init(void) -{ - return spi_register_driver(&m41t93_driver); -} -module_init(m41t93_init); - -static __exit void m41t93_exit(void) -{ - spi_unregister_driver(&m41t93_driver); -} -module_exit(m41t93_exit); +module_spi_driver(m41t93_driver); MODULE_AUTHOR("Nikolaus Voss "); MODULE_DESCRIPTION("Driver for ST M41T93 SPI RTC"); diff --git a/drivers/rtc/rtc-m41t94.c b/drivers/rtc/rtc-m41t94.c index 2a4721f..6e78193 100644 --- a/drivers/rtc/rtc-m41t94.c +++ b/drivers/rtc/rtc-m41t94.c @@ -153,19 +153,7 @@ static struct spi_driver m41t94_driver = { .remove = __devexit_p(m41t94_remove), }; -static __init int m41t94_init(void) -{ - return spi_register_driver(&m41t94_driver); -} - -module_init(m41t94_init); - -static __exit void m41t94_exit(void) -{ - spi_unregister_driver(&m41t94_driver); -} - -module_exit(m41t94_exit); +module_spi_driver(m41t94_driver); MODULE_AUTHOR("Kim B. Heino "); MODULE_DESCRIPTION("Driver for ST M41T94 SPI RTC"); diff --git a/drivers/rtc/rtc-max6902.c b/drivers/rtc/rtc-max6902.c index 1f6b3cc..36c74d2 100644 --- a/drivers/rtc/rtc-max6902.c +++ b/drivers/rtc/rtc-max6902.c @@ -160,17 +160,7 @@ static struct spi_driver max6902_driver = { .remove = __devexit_p(max6902_remove), }; -static __init int max6902_init(void) -{ - return spi_register_driver(&max6902_driver); -} -module_init(max6902_init); - -static __exit void max6902_exit(void) -{ - spi_unregister_driver(&max6902_driver); -} -module_exit(max6902_exit); +module_spi_driver(max6902_driver); MODULE_DESCRIPTION ("max6902 spi RTC driver"); MODULE_AUTHOR ("Raphael Assenat"); diff --git a/drivers/rtc/rtc-pcf2123.c b/drivers/rtc/rtc-pcf2123.c index b46c400..8361187 100644 --- a/drivers/rtc/rtc-pcf2123.c +++ b/drivers/rtc/rtc-pcf2123.c @@ -346,20 +346,9 @@ static struct spi_driver pcf2123_driver = { .remove = __devexit_p(pcf2123_remove), }; -static int __init pcf2123_init(void) -{ - return spi_register_driver(&pcf2123_driver); -} - -static void __exit pcf2123_exit(void) -{ - spi_unregister_driver(&pcf2123_driver); -} +module_spi_driver(pcf2123_driver); MODULE_AUTHOR("Chris Verges "); MODULE_DESCRIPTION("NXP PCF2123 RTC driver"); MODULE_LICENSE("GPL"); MODULE_VERSION(DRV_VERSION); - -module_init(pcf2123_init); -module_exit(pcf2123_exit); diff --git a/drivers/rtc/rtc-r9701.c b/drivers/rtc/rtc-r9701.c index 9beba49c..931f95c 100644 --- a/drivers/rtc/rtc-r9701.c +++ b/drivers/rtc/rtc-r9701.c @@ -159,17 +159,7 @@ static struct spi_driver r9701_driver = { .remove = __devexit_p(r9701_remove), }; -static __init int r9701_init(void) -{ - return spi_register_driver(&r9701_driver); -} -module_init(r9701_init); - -static __exit void r9701_exit(void) -{ - spi_unregister_driver(&r9701_driver); -} -module_exit(r9701_exit); +module_spi_driver(r9701_driver); MODULE_DESCRIPTION("r9701 spi RTC driver"); MODULE_AUTHOR("Magnus Damm "); diff --git a/drivers/rtc/rtc-rs5c348.c b/drivers/rtc/rtc-rs5c348.c index ce2ca85..77074cc 100644 --- a/drivers/rtc/rtc-rs5c348.c +++ b/drivers/rtc/rtc-rs5c348.c @@ -235,18 +235,7 @@ static struct spi_driver rs5c348_driver = { .remove = __devexit_p(rs5c348_remove), }; -static __init int rs5c348_init(void) -{ - return spi_register_driver(&rs5c348_driver); -} - -static __exit void rs5c348_exit(void) -{ - spi_unregister_driver(&rs5c348_driver); -} - -module_init(rs5c348_init); -module_exit(rs5c348_exit); +module_spi_driver(rs5c348_driver); MODULE_AUTHOR("Atsushi Nemoto "); MODULE_DESCRIPTION("Ricoh RS5C348 RTC driver");