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

Commit e7927141 authored by Fabio Estevam's avatar Fabio Estevam Committed by Thierry Reding
Browse files

pwm: mxs: 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.

Cc: Thierry Reding <thierry.reding@avionic-design.de>
Cc: <linux-kernel@vger.kernel.org>
Signed-off-by: default avatarFabio Estevam <fabio.estevam@freescale.com>
Tested-by: default avatarShawn Guo <shawn.guo@linaro.org>
Signed-off-by: default avatarThierry Reding <thierry.reding@gmail.com>
parent aa3495f7

drivers/pwm/pwm-mxs.c

+0 −6
Original line number Diff line number Diff line
@@ -16,7 +16,6 @@ 
#include <linux/module.h>

#include <linux/of.h>

#include <linux/of_address.h>

#include <linux/pinctrl/consumer.h>

#include <linux/platform_device.h>

#include <linux/pwm.h>

#include <linux/slab.h>
@@ -130,7 +129,6 @@ static int mxs_pwm_probe(struct platform_device *pdev) 
	struct device_node *np = pdev->dev.of_node;

	struct mxs_pwm_chip *mxs;

	struct resource *res;

	struct pinctrl *pinctrl;

	int ret;



	mxs = devm_kzalloc(&pdev->dev, sizeof(*mxs), GFP_KERNEL);
@@ -142,10 +140,6 @@ static int mxs_pwm_probe(struct platform_device *pdev) 
	if (IS_ERR(mxs->base))

		return PTR_ERR(mxs->base);



	pinctrl = devm_pinctrl_get_select_default(&pdev->dev);

	if (IS_ERR(pinctrl))

		return PTR_ERR(pinctrl);



	mxs->clk = devm_clk_get(&pdev->dev, NULL);

	if (IS_ERR(mxs->clk))

		return PTR_ERR(mxs->clk);