From patchwork Sun Oct 18 22:21:17 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Gortmaker X-Patchwork-Id: 7432341 X-Patchwork-Delegate: agross@codeaurora.org Return-Path: X-Original-To: patchwork-linux-arm-msm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id D6CE79F302 for ; Sun, 18 Oct 2015 22:22:11 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id EA81620637 for ; Sun, 18 Oct 2015 22:22:10 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C781E205E7 for ; Sun, 18 Oct 2015 22:22:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752427AbbJRWWI (ORCPT ); Sun, 18 Oct 2015 18:22:08 -0400 Received: from mail.windriver.com ([147.11.1.11]:55828 "EHLO mail.windriver.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751752AbbJRWVs (ORCPT ); Sun, 18 Oct 2015 18:21:48 -0400 Received: from ALA-HCA.corp.ad.wrs.com (ala-hca.corp.ad.wrs.com [147.11.189.40]) by mail.windriver.com (8.15.2/8.15.1) with ESMTPS id t9IMLj0q004059 (version=TLSv1 cipher=AES128-SHA bits=128 verify=FAIL); Sun, 18 Oct 2015 15:21:45 -0700 (PDT) Received: from yow-lpgnfs-02.corp.ad.wrs.com (128.224.149.8) by ALA-HCA.corp.ad.wrs.com (147.11.189.40) with Microsoft SMTP Server id 14.3.248.2; Sun, 18 Oct 2015 15:21:44 -0700 From: Paul Gortmaker To: Greg Kroah-Hartman CC: , Paul Gortmaker , Kumar Gala , Andy Gross , David Brown , Jiri Slaby , , , Subject: [PATCH 4/5] drivers/tty/serial: make msm_serial.c explicitly non-modular Date: Sun, 18 Oct 2015 18:21:17 -0400 Message-ID: <1445206878-12455-5-git-send-email-paul.gortmaker@windriver.com> X-Mailer: git-send-email 2.6.1 In-Reply-To: <1445206878-12455-1-git-send-email-paul.gortmaker@windriver.com> References: <1445206878-12455-1-git-send-email-paul.gortmaker@windriver.com> MIME-Version: 1.0 Sender: linux-arm-msm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The Kconfig currently controlling compilation of this code is: drivers/tty/serial/Kconfig:config SERIAL_MSM drivers/tty/serial/Kconfig: bool "MSM on-chip serial port support" ...meaning that it currently is not being built as a module by anyone. 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 don't replace module.h with init.h since the file already has that. We also delete the MODULE_LICENSE tag etc. since all that information is already contained at the top of the file in the comments. Cc: Kumar Gala Cc: Andy Gross Cc: David Brown Cc: Greg Kroah-Hartman Cc: Jiri Slaby Cc: linux-arm-msm@vger.kernel.org Cc: linux-soc@vger.kernel.org Cc: linux-serial@vger.kernel.org Signed-off-by: Paul Gortmaker --- drivers/tty/serial/msm_serial.c | 30 ++++-------------------------- 1 file changed, 4 insertions(+), 26 deletions(-) diff --git a/drivers/tty/serial/msm_serial.c b/drivers/tty/serial/msm_serial.c index dcde955475dc..15afa8070b7d 100644 --- a/drivers/tty/serial/msm_serial.c +++ b/drivers/tty/serial/msm_serial.c @@ -23,7 +23,6 @@ #include #include #include -#include #include #include #include @@ -1601,15 +1600,6 @@ static int msm_serial_probe(struct platform_device *pdev) return uart_add_one_port(&msm_uart_driver, port); } -static int msm_serial_remove(struct platform_device *pdev) -{ - struct uart_port *port = platform_get_drvdata(pdev); - - uart_remove_one_port(&msm_uart_driver, port); - - return 0; -} - static const struct of_device_id msm_match_table[] = { { .compatible = "qcom,msm-uart" }, { .compatible = "qcom,msm-uartdm" }, @@ -1617,11 +1607,11 @@ static const struct of_device_id msm_match_table[] = { }; static struct platform_driver msm_platform_driver = { - .remove = msm_serial_remove, .probe = msm_serial_probe, .driver = { - .name = "msm_serial", - .of_match_table = msm_match_table, + .name = "msm_serial", + .of_match_table = msm_match_table, + .suppress_bind_attrs = true, }, }; @@ -1641,16 +1631,4 @@ static int __init msm_serial_init(void) return ret; } - -static void __exit msm_serial_exit(void) -{ - platform_driver_unregister(&msm_platform_driver); - uart_unregister_driver(&msm_uart_driver); -} - -module_init(msm_serial_init); -module_exit(msm_serial_exit); - -MODULE_AUTHOR("Robert Love "); -MODULE_DESCRIPTION("Driver for msm7x serial device"); -MODULE_LICENSE("GPL"); +device_initcall(msm_serial_init);