From patchwork Wed Apr 23 14:58:30 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felipe Balbi X-Patchwork-Id: 28907 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-vc0-f200.google.com (mail-vc0-f200.google.com [209.85.220.200]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 19C40203AC for ; Wed, 23 Apr 2014 15:21:06 +0000 (UTC) Received: by mail-vc0-f200.google.com with SMTP id lg15sf3993946vcb.11 for ; Wed, 23 Apr 2014 08:21:05 -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=vc8Ik9CWw0u2Jiret9JOj1m4lYIAIsO18JhEyBqnBlA=; b=O09E+SV8twVRjM90SU+kzMv8gCnnbCXaMZhBAjh1zyZgCR8JHmBUpA1zeo0P9DHt86 n9yJ82gI5UqPOUyD5seBa2RWpYA/zsoCzf4BQfPMCXxGJAVXPxb6wcSsP8zUF/fkglTJ T5rf5ZSv7gse//IEHBdINbFow4sfpuipvPHNxOX8vC5SnXHYXWAt7to2KAmyQaZWZygY c4gvZekTPiNtyiuT3Nm3H91tv6V9hJnN+KQNFYc0kzFOZFpEmgroPhUKHRkOUTb+fdTG zflkRsmOlAc4x031r2q+ij06JfPKBD/VVAA82LRxFrMaINkGelu0NhzWIMEx7IRcIKT/ Qzpg== X-Gm-Message-State: ALoCoQkUupweWbCNDWWm0V4Exi/iKMfJAdw3pozP+IbYywa86M3JsgW37NzFHojxoKrU8Dvu2NNM X-Received: by 10.224.95.9 with SMTP id b9mr24214330qan.2.1398266465818; Wed, 23 Apr 2014 08:21:05 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.88.229 with SMTP id t92ls685929qgd.9.gmail; Wed, 23 Apr 2014 08:21:05 -0700 (PDT) X-Received: by 10.220.163.201 with SMTP id b9mr62204vcy.79.1398266465692; Wed, 23 Apr 2014 08:21:05 -0700 (PDT) Received: from mail-ve0-f173.google.com (mail-ve0-f173.google.com [209.85.128.173]) by mx.google.com with ESMTPS id s10si226358vco.56.2014.04.23.08.21.05 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 23 Apr 2014 08:21:05 -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.128.173; Received: by mail-ve0-f173.google.com with SMTP id oy12so1306695veb.18 for ; Wed, 23 Apr 2014 08:21:05 -0700 (PDT) X-Received: by 10.52.130.225 with SMTP id oh1mr36218964vdb.8.1398266465605; Wed, 23 Apr 2014 08:21:05 -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 ib8csp112166vcb; Wed, 23 Apr 2014 08:21:05 -0700 (PDT) X-Received: by 10.42.113.137 with SMTP id c9mr1522397icq.90.1398266465036; Wed, 23 Apr 2014 08:21:05 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id hp1si796753pad.344.2014.04.23.08.21.04; Wed, 23 Apr 2014 08:21:04 -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 S1757704AbaDWPTi (ORCPT + 27 others); Wed, 23 Apr 2014 11:19:38 -0400 Received: from devils.ext.ti.com ([198.47.26.153]:60577 "EHLO devils.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757080AbaDWPBN (ORCPT ); Wed, 23 Apr 2014 11:01:13 -0400 Received: from dlelxv90.itg.ti.com ([172.17.2.17]) by devils.ext.ti.com (8.13.7/8.13.7) with ESMTP id s3NF15UJ030746; Wed, 23 Apr 2014 10:01:05 -0500 Received: from DLEE70.ent.ti.com (dlee70.ent.ti.com [157.170.170.113]) by dlelxv90.itg.ti.com (8.14.3/8.13.8) with ESMTP id s3NF15Cj021743; Wed, 23 Apr 2014 10:01:05 -0500 Received: from dflp32.itg.ti.com (10.64.6.15) by DLEE70.ent.ti.com (157.170.170.113) with Microsoft SMTP Server id 14.3.174.1; Wed, 23 Apr 2014 10:01:05 -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 s3NF14xr017446; Wed, 23 Apr 2014 10:01:05 -0500 From: Felipe Balbi To: Greg KH CC: , , , , , Linux Kernel Mailing List , , , , Linux OMAP Mailing List , Tony Lindgren , Felipe Balbi Subject: [PATCH 06/13] tty: serial: omap: switch over to devm_request_gpio Date: Wed, 23 Apr 2014 09:58:30 -0500 Message-ID: <1398265117-11793-6-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: , this will make sure gpio gets freed automatically when this device is destroyed. Signed-off-by: Felipe Balbi --- drivers/tty/serial/omap-serial.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/tty/serial/omap-serial.c b/drivers/tty/serial/omap-serial.c index f456f46..07d4273 100644 --- a/drivers/tty/serial/omap-serial.c +++ b/drivers/tty/serial/omap-serial.c @@ -1611,7 +1611,7 @@ static int serial_omap_probe_rs485(struct uart_omap_port *up, /* check for tx enable gpio */ up->rts_gpio = of_get_named_gpio_flags(np, "rts-gpio", 0, &flags); if (gpio_is_valid(up->rts_gpio)) { - ret = gpio_request(up->rts_gpio, "omap-serial"); + ret = devm_gpio_request(up->dev, up->rts_gpio, "omap-serial"); if (ret < 0) return ret; ret = gpio_direction_output(up->rts_gpio, @@ -1677,7 +1677,8 @@ static int serial_omap_probe(struct platform_device *pdev) if (gpio_is_valid(omap_up_info->DTR_gpio) && omap_up_info->DTR_present) { - ret = gpio_request(omap_up_info->DTR_gpio, "omap-serial"); + ret = devm_gpio_request(&pdev->dev, omap_up_info->DTR_gpio, + "omap-serial"); if (ret < 0) return ret; ret = gpio_direction_output(omap_up_info->DTR_gpio,