summaryrefslogtreecommitdiff
path: root/drivers/video
diff options
context:
space:
mode:
authorFabio Estevam <fabio.estevam@freescale.com>2013-07-15 21:31:24 (GMT)
committerTomi Valkeinen <tomi.valkeinen@ti.com>2013-07-26 07:45:22 (GMT)
commit76e918933d8198fae49b48b4a89c92a1a0fa627f (patch)
tree8f3d3409b1074d0ef2d54e83ca4cf390f8dcfa51 /drivers/video
parent5b1530d973cad10127d4f670bec49db724e4ac77 (diff)
downloadlinux-76e918933d8198fae49b48b4a89c92a1a0fa627f.tar.xz
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>
Diffstat (limited to 'drivers/video')
-rw-r--r--drivers/video/mxsfb.c8
1 files changed, 0 insertions, 8 deletions
diff --git a/drivers/video/mxsfb.c b/drivers/video/mxsfb.c
index 3ba3771..5861ba2 100644
--- a/drivers/video/mxsfb.c
+++ b/drivers/video/mxsfb.c
@@ -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);