From patchwork Mon Jan 20 09:02:35 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tushar Behera X-Patchwork-Id: 3511261 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 8E251C02DC for ; Mon, 20 Jan 2014 09:08:31 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 88E1E2015E for ; Mon, 20 Jan 2014 09:08:30 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 684352010B for ; Mon, 20 Jan 2014 09:08:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753006AbaATJHw (ORCPT ); Mon, 20 Jan 2014 04:07:52 -0500 Received: from mail-pb0-f45.google.com ([209.85.160.45]:64430 "EHLO mail-pb0-f45.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753030AbaATJHL (ORCPT ); Mon, 20 Jan 2014 04:07:11 -0500 Received: by mail-pb0-f45.google.com with SMTP id un15so3065344pbc.4 for ; Mon, 20 Jan 2014 01:07:11 -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=VeX6HT+5MFwhoTACXNPpOat5MQlJNeGazZod5YBZPX8=; b=fdPKkY/q0eIFWIx+V+ex0rxQmVV9v8JemNNcFT8MZKSf+qrLuH7kvJ5PRh+zcTyg6P wlC6xkatt0Awh+SCvxODRC1Eot5Dj0UWp4CnqeDWkMkYq1hcYkk5KXAnvYH26dJupvc2 NyLOp4IYxsJAJrPX/kxIQi6l157eDlKHMBtaq35blB+H2un2WQm7C4O4FtUUKzjbuI/u Vblu1JxydcbDns9NfQrqFfYJFF7xLxkh8vjvFK2O+n50me9Vy2+I3PPGW+DiFNATwAjR 4aYSu7X8JdonMj/KoC4DERE+RQvG4pgOtDxqB1XI4Smjs+75H+8muz5kIIWdTasTkUFE FbWw== X-Gm-Message-State: ALoCoQlQFuiMwO68XwEUzJzzGGSgyZI1HZOJKe2CX1fyILlJgcRIbyKCUmJGhjDHUCVe2VquMmE9 X-Received: by 10.68.66.103 with SMTP id e7mr17317091pbt.120.1390208830878; Mon, 20 Jan 2014 01:07:10 -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.07 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 20 Jan 2014 01:07:10 -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 2/2] serial: pl011: Move uart_register_driver call to device probe Date: Mon, 20 Jan 2014 14:32:35 +0530 Message-Id: <1390208555-27770-3-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/amba-pl011.c | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/drivers/tty/serial/amba-pl011.c b/drivers/tty/serial/amba-pl011.c index d58783d..d4eda24 100644 --- a/drivers/tty/serial/amba-pl011.c +++ b/drivers/tty/serial/amba-pl011.c @@ -2154,9 +2154,19 @@ static int pl011_probe(struct amba_device *dev, const struct amba_id *id) amba_ports[i] = uap; amba_set_drvdata(dev, uap); + + if (!amba_reg.state) { + ret = uart_register_driver(&amba_reg); + if (ret < 0) { + pr_err("Failed to register AMBA-PL011 driver\n"); + return ret; + } + } + ret = uart_add_one_port(&amba_reg, &uap->port); if (ret) { amba_ports[i] = NULL; + uart_unregister_driver(&amba_reg); pl011_dma_remove(uap); } out: @@ -2175,6 +2185,7 @@ static int pl011_remove(struct amba_device *dev) amba_ports[i] = NULL; pl011_dma_remove(uap); + uart_unregister_driver(&amba_reg); return 0; } @@ -2230,22 +2241,14 @@ static struct amba_driver pl011_driver = { static int __init pl011_init(void) { - int ret; printk(KERN_INFO "Serial: AMBA PL011 UART driver\n"); - ret = uart_register_driver(&amba_reg); - if (ret == 0) { - ret = amba_driver_register(&pl011_driver); - if (ret) - uart_unregister_driver(&amba_reg); - } - return ret; + return amba_driver_register(&pl011_driver); } static void __exit pl011_exit(void) { amba_driver_unregister(&pl011_driver); - uart_unregister_driver(&amba_reg); } /*