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

Commit 4a5bddf7 authored by Fabio Estevam's avatar Fabio Estevam Committed by David S. Miller
Browse files

fec: 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>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 1ca2983a

drivers/net/ethernet/freescale/fec_main.c

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

#include <linux/of_device.h>

#include <linux/of_gpio.h>

#include <linux/of_gpio.h>

#include <linux/of_net.h>

#include <linux/of_net.h>

#include <linux/pinctrl/consumer.h>

#include <linux/regulator/consumer.h>

#include <linux/regulator/consumer.h>





#include <asm/cacheflush.h>

#include <asm/cacheflush.h>
@@ -1841,7 +1840,6 @@ fec_probe(struct platform_device *pdev) 
	struct resource *r;

	struct resource *r;

	const struct of_device_id *of_id;

	const struct of_device_id *of_id;

	static int dev_id;

	static int dev_id;

	struct pinctrl *pinctrl;

	struct regulator *reg_phy;

	struct regulator *reg_phy;





	of_id = of_match_device(fec_dt_ids, &pdev->dev);

	of_id = of_match_device(fec_dt_ids, &pdev->dev);
@@ -1891,12 +1889,6 @@ fec_probe(struct platform_device *pdev) 
		fep->phy_interface = ret;

		fep->phy_interface = ret;

	}

	}





	pinctrl = devm_pinctrl_get_select_default(&pdev->dev);

	if (IS_ERR(pinctrl)) {

		ret = PTR_ERR(pinctrl);

		goto failed_pin;

	}



	fep->clk_ipg = devm_clk_get(&pdev->dev, "ipg");

	fep->clk_ipg = devm_clk_get(&pdev->dev, "ipg");

	if (IS_ERR(fep->clk_ipg)) {

	if (IS_ERR(fep->clk_ipg)) {

		ret = PTR_ERR(fep->clk_ipg);

		ret = PTR_ERR(fep->clk_ipg);
@@ -1996,7 +1988,6 @@ fec_probe(struct platform_device *pdev) 
	clk_disable_unprepare(fep->clk_ipg);

	clk_disable_unprepare(fep->clk_ipg);

	clk_disable_unprepare(fep->clk_enet_out);

	clk_disable_unprepare(fep->clk_enet_out);

	clk_disable_unprepare(fep->clk_ptp);

	clk_disable_unprepare(fep->clk_ptp);

failed_pin:

failed_clk:

failed_clk:

failed_ioremap:

failed_ioremap:

	free_netdev(ndev);

	free_netdev(ndev);