From patchwork Mon Nov 3 16:32:27 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felipe Balbi X-Patchwork-Id: 40037 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-lb0-f200.google.com (mail-lb0-f200.google.com [209.85.217.200]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 8104321894 for ; Mon, 3 Nov 2014 16:33:11 +0000 (UTC) Received: by mail-lb0-f200.google.com with SMTP id f15sf6576904lbj.7 for ; Mon, 03 Nov 2014 08:33: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: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=JbBzqKYNGz8Zp/XLGfFj+T/UURp+/wN4D5RLZHFVCzo=; b=kS2jNU3+DrYJpiTQDO6GwLQPPLWoEwgQAdTQ0pVWdQeb0Nwf1GJMJo4dWj/bNIW+4M MEVZc3rV2xfToIgSTz5bFYn/S5Yvhdye80ujMoauc+FBDmZ02K93BsU9ahPz3HT0Qd0l RrxjLY0L4NxY8W+RDCmdxr6NgHNMMDWY/vdkrsPf1H4BJFn/zKBUtr3R8Mt5eqJFDqMR 5w1WfnqdmrOWJeW2gqCrZrNvD3Ca4CIA5ub6Kl++JV0LmfVQxqylMS7CAX2sYVBloLZl OG2Nb7KPBOTu1EREwEMAlXK5y6Z6zeMUXpjoIaLrIAFiZ+OvqjS9ZrLIzm2LPX2vbEfb d8GA== X-Gm-Message-State: ALoCoQnOO/6lBf+sPmK/ixRSTJJHxUmgg1c6EKWYVnTNUkOLNesnUzXk9wQ7OE9mseJAz+hpEG47 X-Received: by 10.152.42.171 with SMTP id p11mr2915590lal.4.1415032390399; Mon, 03 Nov 2014 08:33:10 -0800 (PST) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.42.173 with SMTP id p13ls205932lal.84.gmail; Mon, 03 Nov 2014 08:33:10 -0800 (PST) X-Received: by 10.112.139.196 with SMTP id ra4mr14118387lbb.95.1415032390193; Mon, 03 Nov 2014 08:33:10 -0800 (PST) Received: from mail-la0-f48.google.com (mail-la0-f48.google.com. [209.85.215.48]) by mx.google.com with ESMTPS id u16si28041060laz.45.2014.11.03.08.33.10 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 03 Nov 2014 08:33:10 -0800 (PST) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.48 as permitted sender) client-ip=209.85.215.48; Received: by mail-la0-f48.google.com with SMTP id gq15so9680725lab.21 for ; Mon, 03 Nov 2014 08:33:10 -0800 (PST) X-Received: by 10.152.87.98 with SMTP id w2mr51509623laz.27.1415032390040; Mon, 03 Nov 2014 08:33:10 -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.112.141.34 with SMTP id rl2csp17369lbb; Mon, 3 Nov 2014 08:33:09 -0800 (PST) X-Received: by 10.68.93.132 with SMTP id cu4mr44208771pbb.36.1415032387834; Mon, 03 Nov 2014 08:33:07 -0800 (PST) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id d7si15601249pdn.206.2014.11.03.08.33.07 for ; Mon, 03 Nov 2014 08:33:07 -0800 (PST) Received-SPF: none (google.com: linux-omap-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 S1752307AbaKCQdG (ORCPT + 5 others); Mon, 3 Nov 2014 11:33:06 -0500 Received: from arroyo.ext.ti.com ([192.94.94.40]:43448 "EHLO arroyo.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751922AbaKCQdE (ORCPT ); Mon, 3 Nov 2014 11:33:04 -0500 Received: from dflxv15.itg.ti.com ([128.247.5.124]) by arroyo.ext.ti.com (8.13.7/8.13.7) with ESMTP id sA3GWx4g015350; Mon, 3 Nov 2014 10:32:59 -0600 Received: from DFLE72.ent.ti.com (dfle72.ent.ti.com [128.247.5.109]) by dflxv15.itg.ti.com (8.14.3/8.13.8) with ESMTP id sA3GWxMD008612; Mon, 3 Nov 2014 10:32:59 -0600 Received: from dlep32.itg.ti.com (157.170.170.100) by DFLE72.ent.ti.com (128.247.5.109) with Microsoft SMTP Server id 14.3.174.1; Mon, 3 Nov 2014 10:32:59 -0600 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 sA3GWw9w012545; Mon, 3 Nov 2014 10:32:59 -0600 From: Felipe Balbi To: , CC: Linux Kernel Mailing List , Linux OMAP Mailing List , , , George Cherian , Felipe Balbi Subject: [PATCH 1/4] extcon: gpio: Convert the driver to use gpio desc API's Date: Mon, 3 Nov 2014 10:32:27 -0600 Message-ID: <1415032350-8459-2-git-send-email-balbi@ti.com> X-Mailer: git-send-email 2.1.0.GIT In-Reply-To: <1415032350-8459-1-git-send-email-balbi@ti.com> References: <1415032350-8459-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=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.48 as permitted sender) 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: , From: George Cherian Convert the driver to use gpiod_* API's. Reviewed-by: Roger Quadros Signed-off-by: George Cherian Signed-off-by: Sekhar Nori Signed-off-by: Felipe Balbi --- drivers/extcon/extcon-gpio.c | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/drivers/extcon/extcon-gpio.c b/drivers/extcon/extcon-gpio.c index 72f19a3..70e3fc7 100644 --- a/drivers/extcon/extcon-gpio.c +++ b/drivers/extcon/extcon-gpio.c @@ -33,8 +33,7 @@ struct gpio_extcon_data { struct extcon_dev *edev; - unsigned gpio; - bool gpio_active_low; + struct gpio_desc *gpiod; const char *state_on; const char *state_off; int irq; @@ -50,9 +49,7 @@ static void gpio_extcon_work(struct work_struct *work) container_of(to_delayed_work(work), struct gpio_extcon_data, work); - state = gpio_get_value(data->gpio); - if (data->gpio_active_low) - state = !state; + state = gpiod_get_value(data->gpiod); extcon_set_state(data->edev, state); } @@ -106,21 +103,20 @@ static int gpio_extcon_probe(struct platform_device *pdev) } extcon_data->edev->name = pdata->name; - extcon_data->gpio = pdata->gpio; - extcon_data->gpio_active_low = pdata->gpio_active_low; + extcon_data->gpiod = gpio_to_desc(pdata->gpio); extcon_data->state_on = pdata->state_on; extcon_data->state_off = pdata->state_off; extcon_data->check_on_resume = pdata->check_on_resume; if (pdata->state_on && pdata->state_off) extcon_data->edev->print_state = extcon_gpio_print_state; - ret = devm_gpio_request_one(&pdev->dev, extcon_data->gpio, GPIOF_DIR_IN, + ret = devm_gpio_request_one(&pdev->dev, pdata->gpio, GPIOF_DIR_IN, pdev->name); if (ret < 0) return ret; if (pdata->debounce) { - ret = gpio_set_debounce(extcon_data->gpio, + ret = gpiod_set_debounce(extcon_data->gpiod, pdata->debounce * 1000); if (ret < 0) extcon_data->debounce_jiffies = @@ -133,7 +129,7 @@ static int gpio_extcon_probe(struct platform_device *pdev) INIT_DELAYED_WORK(&extcon_data->work, gpio_extcon_work); - extcon_data->irq = gpio_to_irq(extcon_data->gpio); + extcon_data->irq = gpiod_to_irq(extcon_data->gpiod); if (extcon_data->irq < 0) return extcon_data->irq;