diff mbox

[3.5,11/60] pinctrl: do not init debugfs entries for unimplemented functionalities

Message ID 1392987687-15367-12-git-send-email-luis.henriques@canonical.com
State New
Headers show

Commit Message

Luis Henriques Feb. 21, 2014, 1 p.m. UTC 
3.5.7.31 -stable review patch.  If anyone has any objections, please let me know.

------------------

From: Florian Vaussard <florian.vaussard@epfl.ch>

commit e7f2a444891cb39f11d5429467d0fd7e011fe7fe upstream.

Commit c420619 "pinctrl: pinconf: remove checks on ops->pin_config_get"
removed the check on (ops != NULL) when performing pinconf_pins_show() or
pinconf_groups_show(). As these entries are always enabled, even if
pinconf is not supported, reading will result in an oops due to NULL
ops.

Instead of checking for ops, remove the corresponding debugfs entries if
pinconf and/or pinmux are not implemented.

Tested on OMAP3 (pinctrl-single).

Signed-off-by: Florian Vaussard <florian.vaussard@epfl.ch>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Luis Henriques <luis.henriques@canonical.com>
---
 drivers/pinctrl/core.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

Comments

Linus Walleij Feb. 25, 2014, 9:24 a.m. UTC | #1 
On Fri, Feb 21, 2014 at 2:00 PM, Luis Henriques
<luis.henriques@canonical.com> wrote:

> 3.5.7.31 -stable review patch.  If anyone has any objections, please let me know.

This was NACKed as stable patch by Greg so drop it if not too late.

Yours,
Linus Walleij
Luis Henriques Feb. 25, 2014, 9:38 a.m. UTC | #2 
On Tue, Feb 25, 2014 at 10:24:00AM +0100, Linus Walleij wrote:
> On Fri, Feb 21, 2014 at 2:00 PM, Luis Henriques
> <luis.henriques@canonical.com> wrote:
> 
> > 3.5.7.31 -stable review patch.  If anyone has any objections, please let me know.
> 
> This was NACKed as stable patch by Greg so drop it if not too late.
> 
> Yours,
> Linus Walleij

I've already dropped this patch, from both the 3.5 and the 3.11 kernels.
Thank you!

Cheers,
--
Luís
diff mbox

Patch

diff --git a/drivers/pinctrl/core.c b/drivers/pinctrl/core.c
index 5e59c45..c172754 100644
--- a/drivers/pinctrl/core.c
+++ b/drivers/pinctrl/core.c
@@ -1327,8 +1327,10 @@  static void pinctrl_init_device_debugfs(struct pinctrl_dev *pctldev)
 			    device_root, pctldev, &pinctrl_groups_ops);
 	debugfs_create_file("gpio-ranges", S_IFREG | S_IRUGO,
 			    device_root, pctldev, &pinctrl_gpioranges_ops);
-	pinmux_init_device_debugfs(device_root, pctldev);
-	pinconf_init_device_debugfs(device_root, pctldev);
+	if (pctldev->desc->pmxops)
+		pinmux_init_device_debugfs(device_root, pctldev);
+	if (pctldev->desc->confops)
+		pinconf_init_device_debugfs(device_root, pctldev);
 }
 
 static void pinctrl_remove_device_debugfs(struct pinctrl_dev *pctldev)