video: mxc: remove pinctrl setup which is already done by device framework KARO-TX6-2015-03-24
authorLothar Waßmann <LW@KARO-electronics.de>
Mon, 9 Mar 2015 09:38:06 +0000 (10:38 +0100)
committerLothar Waßmann <LW@KARO-electronics.de>
Mon, 9 Mar 2015 09:38:06 +0000 (10:38 +0100)
drivers/video/mxc/mxc_lcdif.c

index 6c1b3c9..cbcda9e 100644 (file)
@@ -17,7 +17,6 @@
 #include <linux/module.h>
 #include <linux/mxcfb.h>
 #include <linux/of_device.h>
-#include <linux/pinctrl/consumer.h>
 #include <linux/platform_device.h>
 #include <video/of_display_timing.h>
 #include <video/of_videomode.h>
@@ -253,7 +252,6 @@ static int lcd_get_of_property(struct device *dev,
 static int mxc_lcdif_probe(struct platform_device *pdev)
 {
        int ret;
-       struct pinctrl *pinctrl;
        struct mxc_lcdif_data *lcdif;
        struct mxc_lcd_platform_data *plat_data;
 
@@ -275,12 +273,6 @@ static int mxc_lcdif_probe(struct platform_device *pdev)
                return ret;
        }
 
-       pinctrl = devm_pinctrl_get_select_default(&pdev->dev);
-       if (IS_ERR(pinctrl)) {
-               dev_err(&pdev->dev, "can't get/select pinctrl\n");
-               return PTR_ERR(pinctrl);
-       }
-
        lcdif->dev = &pdev->dev;
        lcdif->disp_lcdif = mxc_dispdrv_register(&lcdif_drv);
        mxc_dispdrv_setdata(lcdif->disp_lcdif, lcdif);