From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751635AbcBKPnb (ORCPT ); Thu, 11 Feb 2016 10:43:31 -0500 Received: from mout.kundenserver.de ([217.72.192.74]:49330 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750884AbcBKPn3 (ORCPT ); Thu, 11 Feb 2016 10:43:29 -0500 From: Arnd Bergmann To: Greg Kroah-Hartman Cc: linux-arm-kernel@lists.infradead.org, Arnd Bergmann , Paul Gortmaker , linux-serial@vger.kernel.org, linux-kernel@vger.kernel.org, Jiri Slaby , Matt Redfearn , Paul Burton Subject: [PATCH v2 2/6] Revert "drivers/tty/serial: make 8250/8250_ingenic.c explicitly non-modular" Date: Thu, 11 Feb 2016 16:41:28 +0100 Message-Id: <1455205297-1021302-3-git-send-email-arnd@arndb.de> X-Mailer: git-send-email 2.7.0 In-Reply-To: <1455205297-1021302-1-git-send-email-arnd@arndb.de> References: <1455205297-1021302-1-git-send-email-arnd@arndb.de> X-Provags-ID: V03:K0:35z6fSZPKrv5kWLa6o0Zj3uqFBCiWRbVlfZgDqLa34aTf3WbcKk X2Dncv0qkO8WmAhoUr4yf47WkXihSkxcGxvfgXUdBCxXyS3XZ8Pd2Eo2rilTfOjQodzlDqw t6VYnNusMfN+4gbramF/u07V+CZ+NRYaqoSl5uBmMCu4LdIPSnndm672IdYuLSCzj7098o2 jEOB7v8/P+s/P1jzM4CKg== X-UI-Out-Filterresults: notjunk:1;V01:K0:TXeEW/6/1cg=:j92GORvBtRgic9qKR8DXmU pd94VZDgccgcXMyFD7q9qVFThXeOq5ferUqsFisa4c4hivZu7CMixwOlJTMjUw5IEAX35Kr0E RlRlmRvKW/xQQ0Pd6Zep/wvvVAQjh23mKW5vvu7zIQj19e/nHa4DBeJnbAki6rG8Q+tg0R5V3 v3oPyii3fK6lxjib6ceNAAz6J/JJBPNwCLnFao8PC31uIABzIJkLsZtvwFyYlh85FQsDrxUvE 38ZqrBKW6QGItxxESD9b6KruGPeNCO2YLB1qfl0iuC43vXZFrwKd1atcrryJBB5EB38F73CfX KQQZ2srpJrbuiCJOvUGvP5V8P5gTiodkzaQdLJl51v5V/43k7sbrSWW2rOROhkxn4pLflf28I wESWDV5qu87roDj0xu6wU1/nXD6FgLurwTsAeLfNVi3ZMGasq8Z2SCpwDKOZeM36h1iQ8sAq1 2WLOW0hG5UrlFu9lgPQVsEMRDOQ9C8GVW0KPI/VRlSyK4CEWmoL3KLn2UMyFIHW+ZFN/ojYfK PSKngPgL7c3Oj6QjGJp/6CTV6FUfPfM9+k+0cOBC+S3hKVW1+PsrwSCqc927B471PH5bDzqLh f4ykcGKtjD7CY1zMHaFCD+p4iJR8acaC3ghpfuoRItDHqKEqfIZTVN/jAb5A8lttq2OU5tj64 rplHRPWTFkDJL1XKCxjAQomzS4NpFhEJcY+BF4ZADLlDB755czYDlV69AgCoYvhAt6q8= Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This reverts commit cafe1ac64023, which tried to remove dead code but left the driver in a useless state when the main 8250 driver is a loadable module. This would normally result in a link error, but as the entire drivers/tty/serial/8250/ directory is only entered when CONFIG_SERIAL_8250 is set, we never notice that the driver does not get built in this configuration. Signed-off-by: Arnd Bergmann Fixes: cafe1ac64023 ("drivers/tty: make serial 8250_ingenic.c explicitly non-modular") --- drivers/tty/serial/8250/8250_ingenic.c | 28 +++++++++++++++++++++------- 1 file changed, 21 insertions(+), 7 deletions(-) diff --git a/drivers/tty/serial/8250/8250_ingenic.c b/drivers/tty/serial/8250/8250_ingenic.c index b4e1d39805b2..97b78558caed 100644 --- a/drivers/tty/serial/8250/8250_ingenic.c +++ b/drivers/tty/serial/8250/8250_ingenic.c @@ -4,8 +4,6 @@ * * Ingenic SoC UART support * - * Author: Paul Burton - * * This program is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the * Free Software Foundation; either version 2 of the License, or (at your @@ -20,7 +18,7 @@ #include #include #include -#include +#include #include #include #include @@ -303,6 +301,16 @@ out: return err; } +static int ingenic_uart_remove(struct platform_device *pdev) +{ + struct ingenic_uart_data *data = platform_get_drvdata(pdev); + + serial8250_unregister_port(data->line); + clk_disable_unprepare(data->clk_module); + clk_disable_unprepare(data->clk_baud); + return 0; +} + static const struct ingenic_uart_config jz4740_uart_config = { .tx_loadsz = 8, .fifosize = 16, @@ -325,13 +333,19 @@ static const struct of_device_id of_match[] = { { .compatible = "ingenic,jz4780-uart", .data = &jz4780_uart_config }, { /* sentinel */ } }; +MODULE_DEVICE_TABLE(of, of_match); static struct platform_driver ingenic_uart_platform_driver = { .driver = { - .name = "ingenic-uart", - .of_match_table = of_match, - .suppress_bind_attrs = true, + .name = "ingenic-uart", + .of_match_table = of_match, }, .probe = ingenic_uart_probe, + .remove = ingenic_uart_remove, }; -builtin_platform_driver(ingenic_uart_platform_driver); + +module_platform_driver(ingenic_uart_platform_driver); + +MODULE_AUTHOR("Paul Burton"); +MODULE_LICENSE("GPL"); +MODULE_DESCRIPTION("Ingenic SoC UART driver"); -- 2.7.0