From patchwork Wed Apr 23 14:58:33 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felipe Balbi X-Patchwork-Id: 28901 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-lb0-f199.google.com (mail-lb0-f199.google.com [209.85.217.199]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 384AD203AC for ; Wed, 23 Apr 2014 15:03:23 +0000 (UTC) Received: by mail-lb0-f199.google.com with SMTP id l4sf605921lbv.6 for ; Wed, 23 Apr 2014 08:03:21 -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=wEdSWrlG9fTfFGKmRgVQvnldbpuCAfCc6qyU2p1kfYo=; b=Aqb0htQCKXY148oUY1Nz8evIBoowy+EBwJ7Bd1xQVy/xf3O+j1ZGqbQK7Au3xM54Ww Hjoq2kn07IHNWZ3uQGxcOOlDp8disgM/ux5blD1eAGu52dj3WbbvVI49Upq5yZjstshm zS4MlI7MTUxEyZ2l4Wqroe5gqdUXBcZYPupcNyr9QDk010Ruh9KfpulUR+TvMaZiaDwD b8XOd+wym5pySUA17VTa/ukZzxOyFo1mf9hgUjsjIXp0hQ+mxnQrg+xIWqlH043UoIQl pfGGuwpCrDUSiwZ9CrcNBbwM3fa1fz+wAy8zL1brNO+Ams+ow3yB/ixqgXTsMrgwwbB1 QUEg== X-Gm-Message-State: ALoCoQlLR9JsZXyVthQrD9IUuAxgi8fPoaKBKMfk4wLRQi8jPB/Td1QQv5dkXY3viy+SRwh/c8MC X-Received: by 10.152.121.100 with SMTP id lj4mr1151870lab.5.1398265401011; Wed, 23 Apr 2014 08:03:21 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.91.183 with SMTP id z52ls644177qgd.59.gmail; Wed, 23 Apr 2014 08:03:20 -0700 (PDT) X-Received: by 10.52.51.226 with SMTP id n2mr357334vdo.57.1398265400726; Wed, 23 Apr 2014 08:03:20 -0700 (PDT) Received: from mail-vc0-f179.google.com (mail-vc0-f179.google.com [209.85.220.179]) by mx.google.com with ESMTPS id rw5si211108vcb.145.2014.04.23.08.03.20 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 23 Apr 2014 08:03:20 -0700 (PDT) Received-SPF: none (google.com: patch+caf_=patchwork-forward=linaro.org@linaro.org does not designate permitted sender hosts) client-ip=209.85.220.179; Received: by mail-vc0-f179.google.com with SMTP id ij19so1288478vcb.38 for ; Wed, 23 Apr 2014 08:03:20 -0700 (PDT) X-Received: by 10.220.5.129 with SMTP id 1mr297394vcv.71.1398265400645; Wed, 23 Apr 2014 08:03:20 -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.221.72 with SMTP id ib8csp110768vcb; Wed, 23 Apr 2014 08:03:19 -0700 (PDT) X-Received: by 10.68.220.137 with SMTP id pw9mr55889835pbc.24.1398265398912; Wed, 23 Apr 2014 08:03:18 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id wg2si775744pab.249.2014.04.23.08.03.18; Wed, 23 Apr 2014 08:03:18 -0700 (PDT) Received-SPF: none (google.com: linux-kernel-owner@vger.kernel.org does not designate permitted sender hosts) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757458AbaDWPDH (ORCPT + 27 others); Wed, 23 Apr 2014 11:03:07 -0400 Received: from comal.ext.ti.com ([198.47.26.152]:57226 "EHLO comal.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757173AbaDWPBP (ORCPT ); Wed, 23 Apr 2014 11:01:15 -0400 Received: from dflxv15.itg.ti.com ([128.247.5.124]) by comal.ext.ti.com (8.13.7/8.13.7) with ESMTP id s3NF18rt026198; Wed, 23 Apr 2014 10:01:08 -0500 Received: from DLEE70.ent.ti.com (dlemailx.itg.ti.com [157.170.170.113]) by dflxv15.itg.ti.com (8.14.3/8.13.8) with ESMTP id s3NF182b021433; Wed, 23 Apr 2014 10:01:08 -0500 Received: from dlep32.itg.ti.com (157.170.170.100) by DLEE70.ent.ti.com (157.170.170.113) with Microsoft SMTP Server id 14.3.174.1; Wed, 23 Apr 2014 10:01:08 -0500 Received: from localhost (ileax41-snat.itg.ti.com [10.172.224.153]) by dlep32.itg.ti.com (8.14.3/8.13.8) with ESMTP id s3NF172U001814; Wed, 23 Apr 2014 10:01:08 -0500 From: Felipe Balbi To: Greg KH CC: , , , , , Linux Kernel Mailing List , , , , Linux OMAP Mailing List , Tony Lindgren , Felipe Balbi Subject: [PATCH 09/13] tty: serial: omap: switch over to devm_ioremap_resource Date: Wed, 23 Apr 2014 09:58:33 -0500 Message-ID: <1398265117-11793-9-git-send-email-balbi@ti.com> X-Mailer: git-send-email 1.9.2.459.g68773ac In-Reply-To: <1398265117-11793-1-git-send-email-balbi@ti.com> References: <1398265117-11793-1-git-send-email-balbi@ti.com> MIME-Version: 1.0 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: balbi@ti.com X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: patch+caf_=patchwork-forward=linaro.org@linaro.org does not designate permitted sender hosts) 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 cb45e88..b46aaf3 100644 --- a/drivers/tty/serial/omap-serial.c +++ b/drivers/tty/serial/omap-serial.c @@ -1644,6 +1644,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; @@ -1662,17 +1663,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) { @@ -1686,10 +1684,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; @@ -1732,14 +1726,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) { @@ -1786,7 +1773,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",