From patchwork Fri Jan 27 07:45:20 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Axel Lin X-Patchwork-Id: 138192 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from merlin.infradead.org (merlin.infradead.org [IPv6:2001:4978:20e::2]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id F266C1007D2 for ; Fri, 27 Jan 2012 18:46:58 +1100 (EST) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1RqgV8-00067S-68; Fri, 27 Jan 2012 07:45:38 +0000 Received: from mail-gx0-f177.google.com ([209.85.161.177]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1RqgUz-00067E-W0 for linux-mtd@lists.infradead.org; Fri, 27 Jan 2012 07:45:30 +0000 Received: by ggnh4 with SMTP id h4so811187ggn.36 for ; Thu, 26 Jan 2012 23:45:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=message-id:subject:from:to:cc:date:content-type:x-mailer :content-transfer-encoding:mime-version; bh=QyG6TixOrt7RM1QyLBu8fABKWgun7uZk6WOI75ha/eY=; b=bBIpctmXNnoakzNjFUtVyzluQ4EoqCrcnP5HWPbtnn7VsXAejgViVeAOiDv703eh2D +i8Hd76FPFg7aWbOtP5VYoCm356apVnjFimRcRPI9KRfi/lkMpLUQbI7Ke3z5Mbg9hUx Hu+1x4lcRjxhb4url4OVFuRCSDKoXcat9QdeE= Received: by 10.236.139.234 with SMTP id c70mr8276723yhj.33.1327650327658; Thu, 26 Jan 2012 23:45:27 -0800 (PST) Received: from [218.172.236.21] (218-172-236-21.dynamic.hinet.net. [218.172.236.21]) by mx.google.com with ESMTPS id 34sm18130404anp.13.2012.01.26.23.45.23 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 26 Jan 2012 23:45:26 -0800 (PST) Message-ID: <1327650320.3758.5.camel@phoenix> Subject: [PATCH] mtd: convert drivers/mtd/* to use module_spi_driver() From: Axel Lin To: linux-mtd@lists.infradead.org Date: Fri, 27 Jan 2012 15:45:20 +0800 X-Mailer: Evolution 3.2.1- Mime-Version: 1.0 X-Spam-Note: CRM114 invocation failed X-Spam-Score: -2.7 (--) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-2.7 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [209.85.161.177 listed in list.dnswl.org] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (axel.lin[at]gmail.com) -0.0 SPF_PASS SPF: sender matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature Cc: Ryan Mallon , Artem Bityutskiy , Andre Renaud , Mike Lavender , David Woodhouse , Andrew Victor X-BeenThere: linux-mtd@lists.infradead.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Linux MTD discussion mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: linux-mtd-bounces@lists.infradead.org Errors-To: linux-mtd-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org This patch converts the drivers in drivers/mtd/* to use the module_spi_driver() macro which makes the code smaller and a bit simpler. Signed-off-by: Axel Lin Cc: Mike Lavender Cc: Andrew Victor Cc: Andre Renaud Cc: Ryan Mallon Acked-by: Ryan Mallon --- drivers/mtd/devices/m25p80.c | 16 +--------------- drivers/mtd/devices/mtd_dataflash.c | 13 +------------ drivers/mtd/devices/sst25l.c | 13 +------------ 3 files changed, 3 insertions(+), 39 deletions(-) diff --git a/drivers/mtd/devices/m25p80.c b/drivers/mtd/devices/m25p80.c index 7c60ddd..230b02e 100644 --- a/drivers/mtd/devices/m25p80.c +++ b/drivers/mtd/devices/m25p80.c @@ -1004,21 +1004,7 @@ static struct spi_driver m25p80_driver = { */ }; - -static int __init m25p80_init(void) -{ - return spi_register_driver(&m25p80_driver); -} - - -static void __exit m25p80_exit(void) -{ - spi_unregister_driver(&m25p80_driver); -} - - -module_init(m25p80_init); -module_exit(m25p80_exit); +module_spi_driver(m25p80_driver); MODULE_LICENSE("GPL"); MODULE_AUTHOR("Mike Lavender"); diff --git a/drivers/mtd/devices/mtd_dataflash.c b/drivers/mtd/devices/mtd_dataflash.c index 236057e..5ec5fc9 100644 --- a/drivers/mtd/devices/mtd_dataflash.c +++ b/drivers/mtd/devices/mtd_dataflash.c @@ -946,18 +946,7 @@ static struct spi_driver dataflash_driver = { /* FIXME: investigate suspend and resume... */ }; -static int __init dataflash_init(void) -{ - return spi_register_driver(&dataflash_driver); -} -module_init(dataflash_init); - -static void __exit dataflash_exit(void) -{ - spi_unregister_driver(&dataflash_driver); -} -module_exit(dataflash_exit); - +module_spi_driver(dataflash_driver); MODULE_LICENSE("GPL"); MODULE_AUTHOR("Andrew Victor, David Brownell"); diff --git a/drivers/mtd/devices/sst25l.c b/drivers/mtd/devices/sst25l.c index 5fc1983..196fd95 100644 --- a/drivers/mtd/devices/sst25l.c +++ b/drivers/mtd/devices/sst25l.c @@ -450,18 +450,7 @@ static struct spi_driver sst25l_driver = { .remove = __devexit_p(sst25l_remove), }; -static int __init sst25l_init(void) -{ - return spi_register_driver(&sst25l_driver); -} - -static void __exit sst25l_exit(void) -{ - spi_unregister_driver(&sst25l_driver); -} - -module_init(sst25l_init); -module_exit(sst25l_exit); +module_spi_driver(sst25l_driver); MODULE_DESCRIPTION("MTD SPI driver for SST25L Flash chips"); MODULE_AUTHOR("Andre Renaud , "