From patchwork Fri May 22 14:35:52 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: grygorii.strashko@linaro.org X-Patchwork-Id: 475622 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id EF802140E44 for ; Sat, 23 May 2015 00:36:23 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757280AbbEVOgW (ORCPT ); Fri, 22 May 2015 10:36:22 -0400 Received: from mail-la0-f45.google.com ([209.85.215.45]:35513 "EHLO mail-la0-f45.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757254AbbEVOgM (ORCPT ); Fri, 22 May 2015 10:36:12 -0400 Received: by labbd9 with SMTP id bd9so14015045lab.2 for ; Fri, 22 May 2015 07:36:10 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=l7Y6cjk0zlOlCrv1Dhhr3yNeP6gnanCIQt3DSem/EAk=; b=PXAAs3VlKf6Ia34mKi55Bql0wxukHRzyhc1INRk0ogR1RwfPRxAbHJcLJ4n5bRORP9 gfe14CAqC5FeGk0lcPTggq/SqfWcLOcI8pkIZ8ZaxDlcayitIjDdC7e0/Asy6ziNU8kF 3fihnVHEbSzdwfsC5zkMGhpPl31e1djrNmxohmklVlWqF4ioZS3TpEBu8XnlRmZM4Vp9 2yMXqGJbHKu+fnhX1Xfhw4+wJ5fwMUke8T4z8vywL9D/mhes8qZ/bqKIiJPHaXMky6vD s36qKoYVMlMwU4wKdOYzrWybuO79j7YrfZSM9VEuED5laZ3xMuRXQSW+4g0hs0AifeNl hzAA== X-Gm-Message-State: ALoCoQkDEZHQd1DH9Z9iXm9lhRBlqTPMUuPJY+0VOPLAREfydVzLN3udDLhCMRn+k8N/+qph/NwT X-Received: by 10.152.115.132 with SMTP id jo4mr6850558lab.102.1432305370595; Fri, 22 May 2015 07:36:10 -0700 (PDT) Received: from localhost ([195.238.92.128]) by mx.google.com with ESMTPSA id n10sm524957laa.40.2015.05.22.07.36.09 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Fri, 22 May 2015 07:36:09 -0700 (PDT) From: Grygorii Strashko To: Linus Walleij , Alexandre Courbot , tony@atomide.com Cc: Javier Martinez Canillas , ssantosh@kernel.org, Kevin Hilman , linux-omap@vger.kernel.org, linux-gpio@vger.kernel.org, Grygorii Strashko Subject: [RFC/RFT PATCH 5/7] gpio: omap: rework omap_gpio_irq_startup to handle current pin state properly Date: Fri, 22 May 2015 17:35:52 +0300 Message-Id: <1432305354-5968-6-git-send-email-grygorii.strashko@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1432305354-5968-1-git-send-email-grygorii.strashko@linaro.org> References: <1432305354-5968-1-git-send-email-grygorii.strashko@linaro.org> Sender: linux-gpio-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-gpio@vger.kernel.org The omap_gpio_irq_startup() can be called at time when: - corresponding GPIO has been requested already and in this case it has to be configured as input already. If not - return with -EINVAL and do not try to re-configure it as it could be unsafe. - corresponding GPIO is free: reconfigure GPIO as input. In addition, call omap_enable_gpio_module directly as all needed checks are already present inside it. Signed-off-by: Grygorii Strashko --- drivers/gpio/gpio-omap.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/drivers/gpio/gpio-omap.c b/drivers/gpio/gpio-omap.c index 2fbd569..1c226f1 100644 --- a/drivers/gpio/gpio-omap.c +++ b/drivers/gpio/gpio-omap.c @@ -790,11 +790,23 @@ static unsigned int omap_gpio_irq_startup(struct irq_data *d) pm_runtime_get_sync(bank->dev); spin_lock_irqsave(&bank->lock, flags); - omap_gpio_init_irq(bank, offset); + + if (!LINE_USED(bank->mod_usage, offset)) + omap_set_gpio_direction(bank, offset, 1); + else if (!omap_gpio_is_input(bank, offset)) + goto err; + omap_enable_gpio_module(bank, offset); + bank->irq_usage |= BIT(offset); + spin_unlock_irqrestore(&bank->lock, flags); omap_gpio_unmask_irq(d); return 0; +err: + spin_unlock_irqrestore(&bank->lock, flags); + if (!BANK_USED(bank)) + pm_runtime_put(bank->dev); + return -EINVAL; } static void omap_gpio_irq_shutdown(struct irq_data *d)