From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752946AbcC0RBg (ORCPT ); Sun, 27 Mar 2016 13:01:36 -0400 Received: from mail5.windriver.com ([192.103.53.11]:43901 "EHLO mail5.wrs.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752369AbcC0RBf (ORCPT ); Sun, 27 Mar 2016 13:01:35 -0400 From: Paul Gortmaker To: CC: Paul Gortmaker , "James E.J. Bottomley" , Thomas Bogendoerfer , , Subject: [PATCH 1/2] drivers/scsi: make jazz_esp.c driver explicitly non-modular Date: Sun, 27 Mar 2016 13:00:24 -0400 Message-ID: <1459098025-26269-2-git-send-email-paul.gortmaker@windriver.com> X-Mailer: git-send-email 2.6.1 In-Reply-To: <1459098025-26269-1-git-send-email-paul.gortmaker@windriver.com> References: <1459098025-26269-1-git-send-email-paul.gortmaker@windriver.com> MIME-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The Kconfig for this driver is currently: config JAZZ_ESP bool "MIPS JAZZ FAS216 SCSI support ...meaning that it currently is not being built as a module by anyone, and it has been this way since the beginning of git history (~2005). Lets remove the modular code that is essentially orphaned, so that when reading the driver there is no doubt it is builtin-only. We explicitly disallow a driver unbind, since that doesn't have a sensible use case anyway, and it allows us to drop the ".remove" code for non-modular drivers. Since module_init translates to device_initcall in the non-modular case, the init ordering remains unchanged with this commit. We also delete the MODULE_LICENSE tag etc. since all that information was (or is now) contained at the top of the file in the comments. Cc: "James E.J. Bottomley" Cc: Thomas Bogendoerfer Cc: linux-scsi@vger.kernel.org Cc: linux-mips@linux-mips.org Signed-off-by: Paul Gortmaker --- drivers/scsi/jazz_esp.c | 43 ++++++------------------------------------- 1 file changed, 6 insertions(+), 37 deletions(-) diff --git a/drivers/scsi/jazz_esp.c b/drivers/scsi/jazz_esp.c index 9aaa74e349cc..4260a0f7e154 100644 --- a/drivers/scsi/jazz_esp.c +++ b/drivers/scsi/jazz_esp.c @@ -1,12 +1,13 @@ /* jazz_esp.c: ESP front-end for MIPS JAZZ systems. * - * Copyright (C) 2007 Thomas Bogendörfer (tsbogend@alpha.frankende) + * Copyright (C) 2007 Thomas Bogendörfer (tsbogend@alpha.franken.de) + * + * License: GPL */ #include #include #include -#include #include #include #include @@ -201,31 +202,11 @@ fail: return err; } -static int esp_jazz_remove(struct platform_device *dev) -{ - struct esp *esp = dev_get_drvdata(&dev->dev); - unsigned int irq = esp->host->irq; - - scsi_esp_unregister(esp); - - free_irq(irq, esp); - dma_free_coherent(esp->dev, 16, - esp->command_block, - esp->command_block_dma); - - scsi_host_put(esp->host); - - return 0; -} - -/* work with hotplug and coldplug */ -MODULE_ALIAS("platform:jazz_esp"); - static struct platform_driver esp_jazz_driver = { .probe = esp_jazz_probe, - .remove = esp_jazz_remove, .driver = { - .name = "jazz_esp", + .name = "jazz_esp", + .suppress_bind_attrs = true, }, }; @@ -233,16 +214,4 @@ static int __init jazz_esp_init(void) { return platform_driver_register(&esp_jazz_driver); } - -static void __exit jazz_esp_exit(void) -{ - platform_driver_unregister(&esp_jazz_driver); -} - -MODULE_DESCRIPTION("JAZZ ESP SCSI driver"); -MODULE_AUTHOR("Thomas Bogendoerfer (tsbogend@alpha.franken.de)"); -MODULE_LICENSE("GPL"); -MODULE_VERSION(DRV_VERSION); - -module_init(jazz_esp_init); -module_exit(jazz_esp_exit); +device_initcall(jazz_esp_init); -- 2.6.1 From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail5.windriver.com ([192.103.53.11]:54884 "EHLO mail5.wrs.com" rhost-flags-OK-OK-OK-OK) by eddie.linux-mips.org with ESMTP id S27025308AbcC0RBcBll0n (ORCPT ); Sun, 27 Mar 2016 19:01:32 +0200 From: Paul Gortmaker Subject: [PATCH 1/2] drivers/scsi: make jazz_esp.c driver explicitly non-modular Date: Sun, 27 Mar 2016 13:00:24 -0400 Message-ID: <1459098025-26269-2-git-send-email-paul.gortmaker@windriver.com> In-Reply-To: <1459098025-26269-1-git-send-email-paul.gortmaker@windriver.com> References: <1459098025-26269-1-git-send-email-paul.gortmaker@windriver.com> MIME-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 8bit Return-Path: Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org List-help: List-unsubscribe: List-software: Ecartis version 1.0.0 List-subscribe: List-owner: List-post: List-archive: To: linux-kernel@vger.kernel.org Cc: Paul Gortmaker , "James E.J. Bottomley" , Thomas Bogendoerfer , linux-scsi@vger.kernel.org, linux-mips@linux-mips.org Message-ID: <20160327170024.sJSkNWtU8bIW1_dSu4Q9EOqAY2RbhI8YpJf9LdTZBPc@z> The Kconfig for this driver is currently: config JAZZ_ESP bool "MIPS JAZZ FAS216 SCSI support ...meaning that it currently is not being built as a module by anyone, and it has been this way since the beginning of git history (~2005). Lets remove the modular code that is essentially orphaned, so that when reading the driver there is no doubt it is builtin-only. We explicitly disallow a driver unbind, since that doesn't have a sensible use case anyway, and it allows us to drop the ".remove" code for non-modular drivers. Since module_init translates to device_initcall in the non-modular case, the init ordering remains unchanged with this commit. We also delete the MODULE_LICENSE tag etc. since all that information was (or is now) contained at the top of the file in the comments. Cc: "James E.J. Bottomley" Cc: Thomas Bogendoerfer Cc: linux-scsi@vger.kernel.org Cc: linux-mips@linux-mips.org Signed-off-by: Paul Gortmaker --- drivers/scsi/jazz_esp.c | 43 ++++++------------------------------------- 1 file changed, 6 insertions(+), 37 deletions(-) diff --git a/drivers/scsi/jazz_esp.c b/drivers/scsi/jazz_esp.c index 9aaa74e349cc..4260a0f7e154 100644 --- a/drivers/scsi/jazz_esp.c +++ b/drivers/scsi/jazz_esp.c @@ -1,12 +1,13 @@ /* jazz_esp.c: ESP front-end for MIPS JAZZ systems. * - * Copyright (C) 2007 Thomas Bogendörfer (tsbogend@alpha.frankende) + * Copyright (C) 2007 Thomas Bogendörfer (tsbogend@alpha.franken.de) + * + * License: GPL */ #include #include #include -#include #include #include #include @@ -201,31 +202,11 @@ fail: return err; } -static int esp_jazz_remove(struct platform_device *dev) -{ - struct esp *esp = dev_get_drvdata(&dev->dev); - unsigned int irq = esp->host->irq; - - scsi_esp_unregister(esp); - - free_irq(irq, esp); - dma_free_coherent(esp->dev, 16, - esp->command_block, - esp->command_block_dma); - - scsi_host_put(esp->host); - - return 0; -} - -/* work with hotplug and coldplug */ -MODULE_ALIAS("platform:jazz_esp"); - static struct platform_driver esp_jazz_driver = { .probe = esp_jazz_probe, - .remove = esp_jazz_remove, .driver = { - .name = "jazz_esp", + .name = "jazz_esp", + .suppress_bind_attrs = true, }, }; @@ -233,16 +214,4 @@ static int __init jazz_esp_init(void) { return platform_driver_register(&esp_jazz_driver); } - -static void __exit jazz_esp_exit(void) -{ - platform_driver_unregister(&esp_jazz_driver); -} - -MODULE_DESCRIPTION("JAZZ ESP SCSI driver"); -MODULE_AUTHOR("Thomas Bogendoerfer (tsbogend@alpha.franken.de)"); -MODULE_LICENSE("GPL"); -MODULE_VERSION(DRV_VERSION); - -module_init(jazz_esp_init); -module_exit(jazz_esp_exit); +device_initcall(jazz_esp_init); -- 2.6.1