From patchwork Thu Mar 20 19:30:01 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felipe Balbi X-Patchwork-Id: 26764 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-qc0-f200.google.com (mail-qc0-f200.google.com [209.85.216.200]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id DF8D220143 for ; Thu, 20 Mar 2014 19:36:53 +0000 (UTC) Received: by mail-qc0-f200.google.com with SMTP id i17sf3148292qcy.7 for ; Thu, 20 Mar 2014 12:36:53 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:sender:precedence:list-id :x-original-sender:x-original-authentication-results:mailing-list :list-post:list-help:list-archive:list-unsubscribe:content-type; bh=VCX1YlFqC4g26vD0xLcdXibQhbmGO4NTXXFeIBFzKUM=; b=NuHBCruxUN1kD15KKFOa9cNjxvutQ7MJAx76wrRKjHLquEQHuMpCstVoRukTpbTwfy 6feQLaxDGxml97jg6p4eXC8u8qWDWXh80SNlpjbTZWJJhivc7LZoY9T888suOmjT3162 /Cqr1ZYZnC3W20cOpVLwLqDaResh7tfo0UGwqrrF7yzsIBHTHq7A5Dzee+TBx9z3hJUy DHmDqK5nHJC6yAh9lm6K5axzrwSBUU36Hi2VWLSVZliGE0EpB+GecevQw3Ho/fndc3Ck 20IJnU6cji2BbSvV9C21KAziX62YiOcEPYWJiIHxgtIAN6Fvcr7V7+ysKcwdGUT5LcGM MrlA== X-Gm-Message-State: ALoCoQlM6InoAXkEz5uLFk/7VZhtuVuiKXZ/IMumlrgu8osY2VZuSgwBZ3KLoGiTiiyzcxIyjXIa X-Received: by 10.52.187.41 with SMTP id fp9mr15683449vdc.5.1395344213575; Thu, 20 Mar 2014 12:36:53 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.98.169 with SMTP id o38ls402425qge.37.gmail; Thu, 20 Mar 2014 12:36:53 -0700 (PDT) X-Received: by 10.58.154.10 with SMTP id vk10mr35075190veb.18.1395344213419; Thu, 20 Mar 2014 12:36:53 -0700 (PDT) Received: from mail-vc0-f169.google.com (mail-vc0-f169.google.com [209.85.220.169]) by mx.google.com with ESMTPS id fn10si655265vdc.171.2014.03.20.12.36.53 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 20 Mar 2014 12:36:53 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.220.169 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.169; Received: by mail-vc0-f169.google.com with SMTP id ik5so1550469vcb.14 for ; Thu, 20 Mar 2014 12:36:53 -0700 (PDT) X-Received: by 10.52.161.130 with SMTP id xs2mr1411123vdb.49.1395344213341; Thu, 20 Mar 2014 12:36:53 -0700 (PDT) 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.78.9 with SMTP id i9csp414178vck; Thu, 20 Mar 2014 12:36:52 -0700 (PDT) X-Received: by 10.68.164.229 with SMTP id yt5mr48560901pbb.28.1395344212476; Thu, 20 Mar 2014 12:36:52 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id tj6si2097391pbc.81.2014.03.20.12.36.51; Thu, 20 Mar 2014 12:36:51 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-omap-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 S933662AbaCTTgu (ORCPT + 5 others); Thu, 20 Mar 2014 15:36:50 -0400 Received: from bear.ext.ti.com ([192.94.94.41]:55523 "EHLO bear.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S965024AbaCTTcC (ORCPT ); Thu, 20 Mar 2014 15:32:02 -0400 Received: from dlelxv90.itg.ti.com ([172.17.2.17]) by bear.ext.ti.com (8.13.7/8.13.7) with ESMTP id s2KJW0vv018662; Thu, 20 Mar 2014 14:32:00 -0500 Received: from DLEE71.ent.ti.com (dlee71.ent.ti.com [157.170.170.114]) by dlelxv90.itg.ti.com (8.14.3/8.13.8) with ESMTP id s2KJVxn2017858; Thu, 20 Mar 2014 14:31:59 -0500 Received: from dflp32.itg.ti.com (10.64.6.15) by DLEE71.ent.ti.com (157.170.170.114) with Microsoft SMTP Server id 14.3.174.1; Thu, 20 Mar 2014 14:31:59 -0500 Received: from localhost (ileax41-snat.itg.ti.com [10.172.224.153]) by dflp32.itg.ti.com (8.14.3/8.13.8) with ESMTP id s2KJVxom030949; Thu, 20 Mar 2014 14:31:59 -0500 From: Felipe Balbi To: Greg KH CC: , , , , , Linux OMAP Mailing List , Linux Kernel Mailing List , Felipe Balbi Subject: [PATCH 05/11] tty: serial: omap: switch over to devm_ioremap_resource Date: Thu, 20 Mar 2014 14:30:01 -0500 Message-ID: <1395343807-21618-5-git-send-email-balbi@ti.com> X-Mailer: git-send-email 1.9.1.286.g5172cb3 In-Reply-To: <1395343807-21618-1-git-send-email-balbi@ti.com> References: <1395343807-21618-1-git-send-email-balbi@ti.com> MIME-Version: 1.0 Sender: linux-omap-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-omap@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: balbi@ti.com X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.220.169 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: , just using helper function to remove some duplicated code a bit. While at that, also move allocation of struct uart_omap_port higher in the code so that we return much earlier in case of no memory. Signed-off-by: Felipe Balbi --- drivers/tty/serial/omap-serial.c | 32 +++++++++----------------------- 1 file changed, 9 insertions(+), 23 deletions(-) diff --git a/drivers/tty/serial/omap-serial.c b/drivers/tty/serial/omap-serial.c index d041060..d785327 100644 --- a/drivers/tty/serial/omap-serial.c +++ b/drivers/tty/serial/omap-serial.c @@ -1627,6 +1627,7 @@ static int serial_omap_probe(struct platform_device *pdev) struct omap_uart_port_info *omap_up_info = dev_get_platdata(&pdev->dev); struct uart_omap_port *up; struct resource *mem; + void __iomem *base; int uartirq = 0; int wakeirq = 0; int ret; @@ -1645,17 +1646,14 @@ static int serial_omap_probe(struct platform_device *pdev) return -EPROBE_DEFER; } - mem = platform_get_resource(pdev, IORESOURCE_MEM, 0); - if (!mem) { - dev_err(&pdev->dev, "no mem resource?\n"); - return -ENODEV; - } + up = devm_kzalloc(&pdev->dev, sizeof(*up), GFP_KERNEL); + if (!up) + return -ENOMEM; - if (!devm_request_mem_region(&pdev->dev, mem->start, resource_size(mem), - pdev->dev.driver->name)) { - dev_err(&pdev->dev, "memory region already claimed\n"); - return -EBUSY; - } + mem = platform_get_resource(pdev, IORESOURCE_MEM, 0); + base = devm_ioremap_resource(&pdev->dev, mem); + if (IS_ERR(base)) + return PTR_ERR(base); if (gpio_is_valid(omap_up_info->DTR_gpio) && omap_up_info->DTR_present) { @@ -1669,10 +1667,6 @@ static int serial_omap_probe(struct platform_device *pdev) return ret; } - up = devm_kzalloc(&pdev->dev, sizeof(*up), GFP_KERNEL); - if (!up) - return -ENOMEM; - if (gpio_is_valid(omap_up_info->DTR_gpio) && omap_up_info->DTR_present) { up->DTR_gpio = omap_up_info->DTR_gpio; @@ -1715,14 +1709,7 @@ static int serial_omap_probe(struct platform_device *pdev) sprintf(up->name, "OMAP UART%d", up->port.line); up->port.mapbase = mem->start; - up->port.membase = devm_ioremap(&pdev->dev, mem->start, - resource_size(mem)); - if (!up->port.membase) { - dev_err(&pdev->dev, "can't ioremap UART\n"); - ret = -ENOMEM; - goto err_ioremap; - } - + up->port.membase = base; up->port.flags = omap_up_info->flags; up->port.uartclk = omap_up_info->uartclk; if (!up->port.uartclk) { @@ -1769,7 +1756,6 @@ static int serial_omap_probe(struct platform_device *pdev) err_add_port: pm_runtime_put(&pdev->dev); pm_runtime_disable(&pdev->dev); -err_ioremap: err_rs485: err_port_line: dev_err(&pdev->dev, "[UART%d]: failure [%s]: %d\n",