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: 23368 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-oa0-f71.google.com (mail-oa0-f71.google.com [209.85.219.71]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id EEB7F2107B for ; Mon, 20 Jan 2014 09:08:10 +0000 (UTC) Received: by mail-oa0-f71.google.com with SMTP id g12sf6863134oah.10 for ; Mon, 20 Jan 2014 01:08:10 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:sender:precedence:list-id :x-original-sender:x-original-authentication-results:mailing-list :list-post:list-help:list-archive:list-unsubscribe; bh=LwRVcqQMOGYbpHHFpU73EcjeVMLGs4n8BMBDO3nipqY=; b=A+9E2ly8Zv1eu0z3GZ9wOV/xd9nHOk2ac6OrT//Jb2AVfTJhkDXgfFnWMtprbHDmE5 0XRKbN0U+H75Fa+Jy+cZ1WIlu2zMBDE8fzouTcVG7STCMQ+63v19+vyDIdaJgSHxpl0J NrBu+MKqJmKqQRkf8dDERvoVW5cP6jXRiGmzLxMR+X7PakW5I/kzHndIEJ1cK713Ovyx KxGLaIFR8FUMDOZ+GlUfS/BeLZCbRPhsalaTb3jt0EFPuXxnsgRHQoIMYl6BstVozQoG KHQAABr1ydqhN8rzr+FPmM7XhONvTJh1Cn3ERuBzF9bSnLouaEetnbyeOEns7P57/5Fe GbRQ== X-Gm-Message-State: ALoCoQngLJWB/xoIwB4VweX4zPtIDV34kUalJMTHwRhOBwEMl9HkYkZzE0KZRdjDBGhK0Q89zSWk X-Received: by 10.42.51.141 with SMTP id e13mr559383icg.28.1390208889945; Mon, 20 Jan 2014 01:08:09 -0800 (PST) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.27.119 with SMTP id 110ls962425qgw.28.gmail; Mon, 20 Jan 2014 01:08:09 -0800 (PST) X-Received: by 10.220.103.141 with SMTP id k13mr641881vco.25.1390208889755; Mon, 20 Jan 2014 01:08:09 -0800 (PST) Received: from mail-vc0-f180.google.com (mail-vc0-f180.google.com [209.85.220.180]) by mx.google.com with ESMTPS id qi8si128794vec.69.2014.01.20.01.08.09 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 20 Jan 2014 01:08:09 -0800 (PST) Received-SPF: neutral (google.com: 209.85.220.180 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.220.180; Received: by mail-vc0-f180.google.com with SMTP id ks9so2593396vcb.25 for ; Mon, 20 Jan 2014 01:08:09 -0800 (PST) X-Received: by 10.58.37.67 with SMTP id w3mr225960vej.22.1390208889661; Mon, 20 Jan 2014 01:08:09 -0800 (PST) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.220.174.196 with SMTP id u4csp48191vcz; Mon, 20 Jan 2014 01:08:09 -0800 (PST) X-Received: by 10.66.249.134 with SMTP id yu6mr17257911pac.37.1390208888708; Mon, 20 Jan 2014 01:08:08 -0800 (PST) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id ye6si613657pbc.80.2014.01.20.01.08.07; Mon, 20 Jan 2014 01:08:07 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753296AbaATJH4 (ORCPT + 26 others); Mon, 20 Jan 2014 04:07:56 -0500 Received: from mail-pa0-f43.google.com ([209.85.220.43]:47247 "EHLO mail-pa0-f43.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753058AbaATJHL (ORCPT ); Mon, 20 Jan 2014 04:07:11 -0500 Received: by mail-pa0-f43.google.com with SMTP id rd3so6788856pab.30 for ; Mon, 20 Jan 2014 01:07:11 -0800 (PST) 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-kernel-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: tushar.behera@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.220.180 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , 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); } /*