From patchwork Thu Nov 14 18:51:18 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 21512 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ob0-f198.google.com (mail-ob0-f198.google.com [209.85.214.198]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 2378823FDD for ; Thu, 14 Nov 2013 18:51:31 +0000 (UTC) Received: by mail-ob0-f198.google.com with SMTP id gq1sf5591989obb.5 for ; Thu, 14 Nov 2013 10:51:31 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:x-original-sender:x-original-authentication-results :precedence:mailing-list:list-id:list-post:list-help:list-archive :list-unsubscribe; bh=Gc4IkN8lYnpBZfwCU30QPL2+eD5M4QhhI4sMJlPVP1U=; b=DArML5uyNDHVRW4jeNCE3HZm60BmtxSlm502f2XITTlbRmQO6ZtfsqN0+nNSiE8ba0 wKp0v3TIhr86co9M1qd5ZrAj4Qw527J3NftGzFDlmjxGmsbNpHOIZJNcuYE6xl97+HpC ++y1prYP6Uvyu10NZkk7q4eszRyz9qgbPnUdNmMIkqIL1qC4jj8Z7VUSV5OcBg7eXk7B i+KWzqZ/IJk75iZLaIG+PYa70AyZyop77T8GyJ2/s1K6Nz7ZDETD2UjY6qcOL0ojHvt1 qULRczyPRjxwa3YxIta7rIfyblZr+poCbB3z1ElX7gJdpovRRDfAqpHpZGqtQlKkKL/c PM2A== X-Gm-Message-State: ALoCoQlAwk53bNiHL8/LFkvkXr0lEUmJiCY0l7h599lSbrCy2VsCfQhf5UNRwpEflfb+CSYvyMOr X-Received: by 10.182.104.200 with SMTP id gg8mr1177619obb.45.1384455091276; Thu, 14 Nov 2013 10:51:31 -0800 (PST) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.48.50 with SMTP id i18ls1116659qen.25.gmail; Thu, 14 Nov 2013 10:51:31 -0800 (PST) X-Received: by 10.58.143.17 with SMTP id sa17mr1737043veb.14.1384455091105; Thu, 14 Nov 2013 10:51:31 -0800 (PST) Received: from mail-ve0-f175.google.com (mail-ve0-f175.google.com [209.85.128.175]) by mx.google.com with ESMTPS id dp3si17667089vcb.96.2013.11.14.10.51.31 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 14 Nov 2013 10:51:31 -0800 (PST) Received-SPF: neutral (google.com: 209.85.128.175 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.128.175; Received: by mail-ve0-f175.google.com with SMTP id jw12so2214243veb.20 for ; Thu, 14 Nov 2013 10:51:31 -0800 (PST) X-Received: by 10.220.164.202 with SMTP id f10mr1670571vcy.25.1384455090923; Thu, 14 Nov 2013 10:51:30 -0800 (PST) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.220.174.196 with SMTP id u4csp338854vcz; Thu, 14 Nov 2013 10:51:30 -0800 (PST) X-Received: by 10.152.28.66 with SMTP id z2mr569359lag.72.1384455089782; Thu, 14 Nov 2013 10:51:29 -0800 (PST) Received: from mail-la0-f44.google.com (mail-la0-f44.google.com [209.85.215.44]) by mx.google.com with ESMTPS id x7si8692682lag.171.2013.11.14.10.51.29 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 14 Nov 2013 10:51:29 -0800 (PST) Received-SPF: neutral (google.com: 209.85.215.44 is neither permitted nor denied by best guess record for domain of linus.walleij@linaro.org) client-ip=209.85.215.44; Received: by mail-la0-f44.google.com with SMTP id ep20so1978866lab.31 for ; Thu, 14 Nov 2013 10:51:29 -0800 (PST) X-Received: by 10.152.225.129 with SMTP id rk1mr579630lac.74.1384455088940; Thu, 14 Nov 2013 10:51:28 -0800 (PST) Received: from localhost.localdomain (c83-254-159-13.bredband.comhem.se. [83.254.159.13]) by mx.google.com with ESMTPSA id xf2sm23386327lbb.4.2013.11.14.10.51.27 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 14 Nov 2013 10:51:27 -0800 (PST) From: Linus Walleij To: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Cc: Stephen Warren , Linus Walleij Subject: [PATCH] pinctrl: nomadik: always display IRQ in debugfs Date: Thu, 14 Nov 2013 19:51:18 +0100 Message-Id: <1384455078-21233-1-git-send-email-linus.walleij@linaro.org> X-Mailer: git-send-email 1.8.3.1 X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: linus.walleij@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.128.175 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , As we now grab IRQs also without first reserving the GPIO line, let's print the mapped IRQ unconditionally in the debugfs file as well. Signed-off-by: Linus Walleij --- drivers/pinctrl/pinctrl-nomadik.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/pinctrl/pinctrl-nomadik.c b/drivers/pinctrl/pinctrl-nomadik.c index 7111c3b59130..cea951f5fa49 100644 --- a/drivers/pinctrl/pinctrl-nomadik.c +++ b/drivers/pinctrl/pinctrl-nomadik.c @@ -846,14 +846,14 @@ static void nmk_gpio_dbg_show_one(struct seq_file *s, (mode < 0) ? "unknown" : modes[mode], pull ? "pull" : "none"); - if (label && !is_out) { - int irq = gpio_to_irq(gpio); + if (!is_out) { + int irq = gpio_to_irq(gpio); struct irq_desc *desc = irq_to_desc(irq); /* This races with request_irq(), set_irq_type(), * and set_irq_wake() ... but those are "rare". */ - if (irq >= 0 && desc->action) { + if (irq > 0 && desc && desc->action) { char *trigger; u32 bitmask = nmk_gpio_get_bitmask(gpio);