From patchwork Mon Jan 20 09:02:34 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tushar Behera X-Patchwork-Id: 3511271 Return-Path: X-Original-To: patchwork-linux-samsung-soc@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 91130C02DC for ; Mon, 20 Jan 2014 09:08:34 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 7C87E2015E for ; Mon, 20 Jan 2014 09:08:33 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 908C92010B for ; Mon, 20 Jan 2014 09:08:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752882AbaATJHu (ORCPT ); Mon, 20 Jan 2014 04:07:50 -0500 Received: from mail-pd0-f180.google.com ([209.85.192.180]:61474 "EHLO mail-pd0-f180.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752910AbaATJHH (ORCPT ); Mon, 20 Jan 2014 04:07:07 -0500 Received: by mail-pd0-f180.google.com with SMTP id x10so5313246pdj.39 for ; Mon, 20 Jan 2014 01:07:07 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=ojwKdIy+cdXPj0yjdo/DJAR2iQQ3ZOFokZ8dqYmjH6s=; b=Ldv8Trv1nh9Kxrq885cd4R/u5ub1mv0DPnGutxv9aFfn9q+RGmgTo5X3NjMP6x9Itn BdXaJ6EnzaHNbb9lid3dVdrv33XH9cy9eS2jX62TFFvL5mOZmo+PqfhquxSHt7u7b8Zd lTNg2Q1iM0tmECoiybj2gyLdUwMAdW6i3V0eWv7peFD4H+suLMxfVmkZdf62x/gnGOWK wfenk+iQO1SDcOqC5+FwS4jSY6NdaUGTLqX6fLDYAghKX0CvOZCsVnv5FwWek7Rabkgc rDjRwiU1SgQ7zdWkQbYRXgsv+dwAfc7PIA48PdBTYp+qDXrvpjsiOfY0GHUNaCtWxu8z py7g== X-Gm-Message-State: ALoCoQk5PRFlMTA4dfVjXck4YvhKoLZOTR21ZzFM4/zjDK/wwxtTVnhzMIw8C0W9ex5RRvjn9s6U X-Received: by 10.66.66.202 with SMTP id h10mr17569189pat.70.1390208827229; Mon, 20 Jan 2014 01:07:07 -0800 (PST) Received: from linaro.sisodomain.com ([115.113.119.130]) by mx.google.com with ESMTPSA id by1sm1235086pbd.25.2014.01.20.01.07.03 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 20 Jan 2014 01:07:06 -0800 (PST) From: Tushar Behera To: linux-kernel@vger.kernel.org, linux-serial@vger.kernel.org, linux-samsung-soc@vger.kernel.org Cc: jslaby@suse.cz, gregkh@linuxfoundation.org, linux@arm.linux.org.uk, ben.dooks@codethink.co.uk, broonie@kernel.org Subject: [PATCH 1/2] serial: samsung: Move uart_register_driver call to device probe Date: Mon, 20 Jan 2014 14:32:34 +0530 Message-Id: <1390208555-27770-2-git-send-email-tushar.behera@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1390208555-27770-1-git-send-email-tushar.behera@linaro.org> References: <1390208555-27770-1-git-send-email-tushar.behera@linaro.org> Sender: linux-samsung-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-samsung-soc@vger.kernel.org X-Spam-Status: No, score=-7.5 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, 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 uart_register_driver call binds the driver to a specific device node through tty_register_driver call. This should typically happen during device probe call. In a multiplatform scenario, it is possible that multiple serial drivers are part of the kernel. Currently the driver registration fails if multiple serial drivers with same default major/minor numbers are included in the kernel. A typical case is observed with amba-pl011 and samsung-uart drivers. Signed-off-by: Tushar Behera --- drivers/tty/serial/samsung.c | 40 +++++++++++----------------------------- 1 file changed, 11 insertions(+), 29 deletions(-) diff --git a/drivers/tty/serial/samsung.c b/drivers/tty/serial/samsung.c index c1af04d..f8f41dc 100644 --- a/drivers/tty/serial/samsung.c +++ b/drivers/tty/serial/samsung.c @@ -1283,6 +1283,14 @@ static int s3c24xx_serial_probe(struct platform_device *pdev) if (ret < 0) goto probe_err; + if (!s3c24xx_uart_drv.state) { + ret = uart_register_driver(&s3c24xx_uart_drv); + if (ret < 0) { + pr_err("Failed to register Samsung UART driver\n"); + return ret; + } + } + dbg("%s: adding port\n", __func__); uart_add_one_port(&s3c24xx_uart_drv, &ourport->port); platform_set_drvdata(pdev, &ourport->port); @@ -1315,6 +1323,8 @@ static int s3c24xx_serial_remove(struct platform_device *dev) uart_remove_one_port(&s3c24xx_uart_drv, port); } + uart_unregister_driver(&s3c24xx_uart_drv); + return 0; } @@ -1814,35 +1824,7 @@ static struct platform_driver samsung_serial_driver = { }, }; -/* module initialisation code */ - -static int __init s3c24xx_serial_modinit(void) -{ - int ret; - - ret = uart_register_driver(&s3c24xx_uart_drv); - if (ret < 0) { - pr_err("Failed to register Samsung UART driver\n"); - return ret; - } - - ret = platform_driver_register(&samsung_serial_driver); - if (ret < 0) { - pr_err("Failed to register platform driver\n"); - uart_unregister_driver(&s3c24xx_uart_drv); - } - - return ret; -} - -static void __exit s3c24xx_serial_modexit(void) -{ - platform_driver_unregister(&samsung_serial_driver); - uart_unregister_driver(&s3c24xx_uart_drv); -} - -module_init(s3c24xx_serial_modinit); -module_exit(s3c24xx_serial_modexit); +module_platform_driver(samsung_serial_driver); MODULE_ALIAS("platform:samsung-uart"); MODULE_DESCRIPTION("Samsung SoC Serial port driver");