From patchwork Wed Aug 14 16:25:33 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 2844671 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 7E4D1BF546 for ; Wed, 14 Aug 2013 16:26:12 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 4CE1C205A3 for ; Wed, 14 Aug 2013 16:26:11 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id EE7C9205A1 for ; Wed, 14 Aug 2013 16:26:09 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1V9dtf-0003eq-Ah; Wed, 14 Aug 2013 16:26:07 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1V9dtd-0006Yp-34; Wed, 14 Aug 2013 16:26:05 +0000 Received: from mail-lb0-f179.google.com ([209.85.217.179]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1V9dtZ-0006Y1-F3 for linux-arm-kernel@lists.infradead.org; Wed, 14 Aug 2013 16:26:02 +0000 Received: by mail-lb0-f179.google.com with SMTP id v1so7074214lbd.10 for ; Wed, 14 Aug 2013 09:25:38 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=SG5xMt+uMdThOM5GISiR1ASb1nfvrdi1j6AuTzQ8zcI=; b=OZcpSZd/+IYEAYfHjH4/AeQNUQYFZcvf+geWKoPf/+CP9sn77EhWnwvHf1oZwvoBeN fehlXRczRPw4cLpBSB54QJr+WHwxHuaD8NWPtE2AlqDuYMrPyEmKKr8dpkCXh4gcRrbd ss0oLKwGD+er30Ukv1V7KZrGbZjPXlOBAgsUnBAnLMCssjcgztHMphVxjasu9mOlG6em hcfNdVgSXhfJUETryj/FUbg4u68vzvShtbfCmeX5g3Z4opU5r7m7ngdJlJDgw5DH7fUh oIHTeNrFQfXqLWeRcHaJl2aXDFWIKjRHzA3oXt77W5Iw2IdQJ8l+Z0KzYg10OPJxZIIF EPPA== X-Gm-Message-State: ALoCoQkVjFrtIjwlrtoGDdHSECGGb3vNn8EW2uTRh0HN5skg7sxPI2f5YG32qwzT/ebmhdJP75NJ X-Received: by 10.112.50.72 with SMTP id a8mr1043272lbo.50.1376497538621; Wed, 14 Aug 2013 09:25:38 -0700 (PDT) Received: from localhost.localdomain (c83-249-208-76.bredband.comhem.se. [83.249.208.76]) by mx.google.com with ESMTPSA id w5sm15780934lbw.3.2013.08.14.09.25.36 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Wed, 14 Aug 2013 09:25:37 -0700 (PDT) From: Linus Walleij To: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH] pinctrl: improve warning messages Date: Wed, 14 Aug 2013 18:25:33 +0200 Message-Id: <1376497533-32303-1-git-send-email-linus.walleij@linaro.org> X-Mailer: git-send-email 1.8.1.4 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130814_122601_631362_F0B11068 X-CRM114-Status: UNSURE ( 9.92 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -2.6 (--) Cc: Linus Walleij , Sonic Zhang , Stephen Warren X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-7.0 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Print out the affected group name on activation of pin mux settings, and warn if you cannot free a pin that should have been part of a certain setting. Cc: Sonic Zhang Signed-off-by: Linus Walleij --- drivers/pinctrl/pinmux.c | 35 +++++++++++++++++++++++++++++------ 1 file changed, 29 insertions(+), 6 deletions(-) diff --git a/drivers/pinctrl/pinmux.c b/drivers/pinctrl/pinmux.c index 5f51588..008f965 100644 --- a/drivers/pinctrl/pinmux.c +++ b/drivers/pinctrl/pinmux.c @@ -400,10 +400,14 @@ int pinmux_enable_setting(struct pinctrl_setting const *setting) ret = pctlops->get_group_pins(pctldev, setting->data.mux.group, &pins, &num_pins); if (ret) { + const char *gname; + /* errors only affect debug data, so just warn */ + gname = pctlops->get_group_name(pctldev, + setting->data.mux.group); dev_warn(pctldev->dev, - "could not get pins for group selector %d\n", - setting->data.mux.group); + "could not get pins for group %s\n", + gname); num_pins = 0; } @@ -411,9 +415,14 @@ int pinmux_enable_setting(struct pinctrl_setting const *setting) for (i = 0; i < num_pins; i++) { ret = pin_request(pctldev, pins[i], setting->dev_name, NULL); if (ret) { + const char *gname; + + gname = pctlops->get_group_name(pctldev, + setting->data.mux.group); dev_err(pctldev->dev, - "could not request pin %d on device %s\n", - pins[i], pinctrl_dev_get_name(pctldev)); + "could not request pin %d from group %s on " + "device %s\n", + pins[i], gname, pinctrl_dev_get_name(pctldev)); goto err_pin_request; } } @@ -466,10 +475,14 @@ void pinmux_disable_setting(struct pinctrl_setting const *setting) ret = pctlops->get_group_pins(pctldev, setting->data.mux.group, &pins, &num_pins); if (ret) { + const char *gname; + /* errors only affect debug data, so just warn */ + gname = pctlops->get_group_name(pctldev, + setting->data.mux.group); dev_warn(pctldev->dev, - "could not get pins for group selector %d\n", - setting->data.mux.group); + "could not get pins for group %s\n", + gname); num_pins = 0; } @@ -486,6 +499,16 @@ void pinmux_disable_setting(struct pinctrl_setting const *setting) desc->mux_setting = NULL; /* And release the pin */ pin_free(pctldev, pins[i], NULL); + } else { + const char *gname; + + gname = pctlops->get_group_name(pctldev, + setting->data.mux.group); + dev_warn(pctldev->dev, + "not freeing pin %d as part of deactivating " + "group %s - it is already used for some other " + "setting", + pins[i], gname); } }