diff options
author | Fabio Estevam <fabio.estevam@freescale.com> | 2013-07-15 17:31:24 -0400 |
---|---|---|
committer | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2013-07-26 03:45:22 -0400 |
commit | 76e918933d8198fae49b48b4a89c92a1a0fa627f (patch) | |
tree | 8f3d3409b1074d0ef2d54e83ca4cf390f8dcfa51 | |
parent | 5b1530d973cad10127d4f670bec49db724e4ac77 (diff) |
video: mxsfb: Let device core handle pinctrl
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>
-rw-r--r-- | drivers/video/mxsfb.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/drivers/video/mxsfb.c b/drivers/video/mxsfb.c index 3ba37713b1f9..5861ba2c2a20 100644 --- a/drivers/video/mxsfb.c +++ b/drivers/video/mxsfb.c | |||
@@ -46,7 +46,6 @@ | |||
46 | #include <linux/clk.h> | 46 | #include <linux/clk.h> |
47 | #include <linux/dma-mapping.h> | 47 | #include <linux/dma-mapping.h> |
48 | #include <linux/io.h> | 48 | #include <linux/io.h> |
49 | #include <linux/pinctrl/consumer.h> | ||
50 | #include <linux/fb.h> | 49 | #include <linux/fb.h> |
51 | #include <linux/regulator/consumer.h> | 50 | #include <linux/regulator/consumer.h> |
52 | #include <video/of_display_timing.h> | 51 | #include <video/of_display_timing.h> |
@@ -877,7 +876,6 @@ static int mxsfb_probe(struct platform_device *pdev) | |||
877 | struct mxsfb_info *host; | 876 | struct mxsfb_info *host; |
878 | struct fb_info *fb_info; | 877 | struct fb_info *fb_info; |
879 | struct fb_modelist *modelist; | 878 | struct fb_modelist *modelist; |
880 | struct pinctrl *pinctrl; | ||
881 | int ret; | 879 | int ret; |
882 | 880 | ||
883 | if (of_id) | 881 | if (of_id) |
@@ -908,12 +906,6 @@ static int mxsfb_probe(struct platform_device *pdev) | |||
908 | 906 | ||
909 | host->devdata = &mxsfb_devdata[pdev->id_entry->driver_data]; | 907 | host->devdata = &mxsfb_devdata[pdev->id_entry->driver_data]; |
910 | 908 | ||
911 | pinctrl = devm_pinctrl_get_select_default(&pdev->dev); | ||
912 | if (IS_ERR(pinctrl)) { | ||
913 | ret = PTR_ERR(pinctrl); | ||
914 | goto fb_release; | ||
915 | } | ||
916 | |||
917 | host->clk = devm_clk_get(&host->pdev->dev, NULL); | 909 | host->clk = devm_clk_get(&host->pdev->dev, NULL); |
918 | if (IS_ERR(host->clk)) { | 910 | if (IS_ERR(host->clk)) { |
919 | ret = PTR_ERR(host->clk); | 911 | ret = PTR_ERR(host->clk); |