[PATCH 1/2] pinctrl: use ERR_CAST instead of ERR_PTR(PTR_ERR(...))

[PATCH 1/2] pinctrl: use ERR_CAST instead of ERR_PTR(PTR_ERR(...))

[Uwe Kleine-König]

This doesn't change semantics, just looks nicer.

Signed-off-by: Uwe Kleine-K?nig <u.kleine-koenig@pengutronix.de>
---
 include/linux/pinctrl/consumer.h |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/linux/pinctrl/consumer.h b/include/linux/pinctrl/consumer.h
index 6dd96fb..5431f26 100644
--- a/include/linux/pinctrl/consumer.h
+++ b/include/linux/pinctrl/consumer.h
@@ -139,7 +139,7 @@ static inline struct pinctrl * __must_check devm_pinctrl_get_select(
 	s = pinctrl_lookup_state(p, name);
 	if (IS_ERR(s)) {
 		devm_pinctrl_put(p);
-		return ERR_PTR(PTR_ERR(s));
+		return ERR_CAST(s);
 	}
 
 	ret = pinctrl_select_state(p, s);
-- 
1.7.10.4

[PATCH 2/2] MAINTAINERS: fix a few pinctrl related entries

[Uwe Kleine-König]

Signed-off-by: Uwe Kleine-K?nig <u.kleine-koenig@pengutronix.de>
---
 MAINTAINERS |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/MAINTAINERS b/MAINTAINERS
index fe643e7..32d57e3 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -5296,14 +5296,15 @@ PIN CONTROL SUBSYSTEM
 M:	Linus Walleij <linus.walleij@linaro.org>
 S:	Maintained
 F:	drivers/pinctrl/
+F:	include/linux/pinctrl/
 
 PIN CONTROLLER - ST SPEAR
-M:     Viresh Kumar <viresh.linux@gmail.com>
+M:	Viresh Kumar <viresh.linux@gmail.com>
 L:	spear-devel at list.st.com
 L:	linux-arm-kernel at lists.infradead.org (moderated for non-subscribers)
 W:	http://www.st.com/spear
 S:	Maintained
-F:	driver/pinctrl/spear/
+F:	drivers/pinctrl/spear/
 
 PKTCDVD DRIVER
 M:	Peter Osterlund <petero2@telia.com>
-- 
1.7.10.4

[PATCH 1/2] pinctrl: use ERR_CAST instead of ERR_PTR(PTR_ERR(...))

[Linus Walleij]

On Mon, Jul 30, 2012 at 6:38 PM, Uwe Kleine-K?nig
<u.kleine-koenig@pengutronix.de> wrote:

> This doesn't change semantics, just looks nicer.
>
> Signed-off-by: Uwe Kleine-K?nig <u.kleine-koenig@pengutronix.de>

Applied for v3.7.

Thanks,
Linus Walleij

[PATCH 2/2] MAINTAINERS: fix a few pinctrl related entries

[Linus Walleij]

On Mon, Jul 30, 2012 at 6:38 PM, Uwe Kleine-K?nig
<u.kleine-koenig@pengutronix.de> wrote:

> Signed-off-by: Uwe Kleine-K?nig <u.kleine-koenig@pengutronix.de>

Applied.

Thanks,
Linus Walleij