Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 76e91893 authored by Fabio Estevam's avatar Fabio Estevam Committed by Tomi Valkeinen
Browse files

video: mxsfb: Let device core handle pinctrl 



Since commit ab78029e (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: default avatarFabio Estevam <fabio.estevam@freescale.com>
Acked-by: default avatarShawn Guo <shawn.guo@linaro.org>
Signed-off-by: default avatarTomi Valkeinen <tomi.valkeinen@ti.com>
parent 5b1530d9

drivers/video/mxsfb.c

+0 −8
Original line number Diff line number Diff line
@@ -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);