From patchwork Fri May 22 14:35:53 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: 475624 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 1DFAF140E44 for ; Sat, 23 May 2015 00:36:25 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757277AbbEVOgV (ORCPT ); Fri, 22 May 2015 10:36:21 -0400 Received: from mail-lb0-f170.google.com ([209.85.217.170]:36337 "EHLO mail-lb0-f170.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756486AbbEVOgN (ORCPT ); Fri, 22 May 2015 10:36:13 -0400 Received: by lbbqq2 with SMTP id qq2so14265712lbb.3 for ; Fri, 22 May 2015 07:36:12 -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=6cKrpj5xAdHYbisDcTR95JCKgMpk9vR60DTrsEMlhGM=; b=jnPWiVSaha+KUDVDqPt9ScAYUY6a1ZhPQ77WwVonNGTbQrAQSaeaLLMnjWYZvFH+IP mE7cDgGKKE5XmCpUQ2OhmwXL5bTrm9bwi/X3xIZZi4Quv/APgt7uAM5q3hhgFOaFkqbC Vu7O//gic1FjCC6VwVjiNLuduTL8C2JIewMUD9vnU4Rw4Fcv+KUblNWraazrV3f81mvn 2VyGm6l12L9Mr0IzjYYhhM204Iz9uyBKUDU3Zd4foFbDeMPgkAFWC9YCJCFmPF1qAVjd sgnaKi3e2dTmZ86/PO/lqzgfPZpATbxIm84/3UIIzN/xb3TKxgPKndO/d5BzZ8LN4O6k cGQA== X-Gm-Message-State: ALoCoQmfnJtwYA/gC/iwT4E8jwHdSnhWucH4w7EFQwfxdW/zab3eS8w1i68xt136koosZJH5BuXD X-Received: by 10.152.197.2 with SMTP id iq2mr6726030lac.103.1432305372466; Fri, 22 May 2015 07:36:12 -0700 (PDT) Received: from localhost ([195.238.92.128]) by mx.google.com with ESMTPSA id k15sm528995laa.28.2015.05.22.07.36.11 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Fri, 22 May 2015 07:36:11 -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 6/7] gpio: omap: clean up omap_gpio_irq_type Date: Fri, 22 May 2015 17:35:53 +0300 Message-Id: <1432305354-5968-7-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_type() can do only configuration of GPIO IRQ triggering type, because now OMAP GPIO driver has implemented .irq_startup()/.irq_shutdown() which are responsible for GPIO bank enabling and pin direction configuration. Hence, remove redundant code and omap_gpio_init_irq() which is not used any more. Signed-off-by: Grygorii Strashko --- drivers/gpio/gpio-omap.c | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/drivers/gpio/gpio-omap.c b/drivers/gpio/gpio-omap.c index 1c226f1..f02b3fa 100644 --- a/drivers/gpio/gpio-omap.c +++ b/drivers/gpio/gpio-omap.c @@ -472,15 +472,6 @@ static int omap_gpio_is_input(struct gpio_bank *bank, unsigned offset) return readl_relaxed(reg) & BIT(offset); } -static void omap_gpio_init_irq(struct gpio_bank *bank, unsigned offset) -{ - if (!LINE_USED(bank->mod_usage, offset)) { - omap_enable_gpio_module(bank, offset); - omap_set_gpio_direction(bank, offset, 1); - } - bank->irq_usage |= BIT(offset); -} - static int omap_gpio_irq_type(struct irq_data *d, unsigned type) { struct gpio_bank *bank = omap_irq_data_get_bank(d); @@ -502,12 +493,6 @@ static int omap_gpio_irq_type(struct irq_data *d, unsigned type) retval = omap_set_gpio_triggering(bank, offset, type); if (retval) goto error; - omap_gpio_init_irq(bank, offset); - if (!omap_gpio_is_input(bank, offset)) { - spin_unlock_irqrestore(&bank->lock, flags); - retval = -EINVAL; - goto error; - } spin_unlock_irqrestore(&bank->lock, flags); if (type & (IRQ_TYPE_LEVEL_LOW | IRQ_TYPE_LEVEL_HIGH))