]> git.karo-electronics.de Git - linux-beck.git/commitdiff
video: mxsfb: Let device core handle pinctrl
authorFabio Estevam <fabio.estevam@freescale.com>
Mon, 15 Jul 2013 21:31:24 +0000 (18:31 -0300)
committerTomi Valkeinen <tomi.valkeinen@ti.com>
Fri, 26 Jul 2013 07:45:22 +0000 (10:45 +0300)
Since commit ab78029 (drivers/pinctrl: grab default handles from device core)
we can rely on device core for handling pinctrl, so remove
devm_pinctrl_get_select_default() from the driver.

Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
Acked-by: Shawn Guo <shawn.guo@linaro.org>
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
drivers/video/mxsfb.c

index 3ba37713b1f97795c875ded477e5dfe37b2259b7..5861ba2c2a20c04815533a5939064b7e91c32f2c 100644 (file)
@@ -46,7 +46,6 @@
 #include <linux/clk.h>
 #include <linux/dma-mapping.h>
 #include <linux/io.h>
-#include <linux/pinctrl/consumer.h>
 #include <linux/fb.h>
 #include <linux/regulator/consumer.h>
 #include <video/of_display_timing.h>
@@ -877,7 +876,6 @@ static int mxsfb_probe(struct platform_device *pdev)
        struct mxsfb_info *host;
        struct fb_info *fb_info;
        struct fb_modelist *modelist;
-       struct pinctrl *pinctrl;
        int ret;
 
        if (of_id)
@@ -908,12 +906,6 @@ static int mxsfb_probe(struct platform_device *pdev)
 
        host->devdata = &mxsfb_devdata[pdev->id_entry->driver_data];
 
-       pinctrl = devm_pinctrl_get_select_default(&pdev->dev);
-       if (IS_ERR(pinctrl)) {
-               ret = PTR_ERR(pinctrl);
-               goto fb_release;
-       }
-
        host->clk = devm_clk_get(&host->pdev->dev, NULL);
        if (IS_ERR(host->clk)) {
                ret = PTR_ERR(host->clk);