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

Commit 54842ec2 authored by Wolfram Sang's avatar Wolfram Sang Committed by David S. Miller
Browse files

drivers/net/ethernet/cadence: don't use devm_pinctrl_get_select_default() in probe 



Since commit ab78029e (drivers/pinctrl: grab default handles from device core),
we can rely on device core for setting the default pins. Compile tested only.

Acked-by: Linus Walleij <linus.walleij@linaro.org> (personally at LCE13)
Signed-off-by: default avatarWolfram Sang <wsa@the-dreams.de>
Acked-by: default avatarNicolas Ferre <nicolas.ferre@atmel.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent d25903f8

drivers/net/ethernet/cadence/at91_ether.c

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

#include <linux/of_device.h>

#include <linux/of_net.h>

#include <linux/pinctrl/consumer.h>



#include "macb.h"
@@ -309,7 +308,6 @@ static int __init at91ether_probe(struct platform_device *pdev) 
	struct resource *regs;

	struct net_device *dev;

	struct phy_device *phydev;

	struct pinctrl *pinctrl;

	struct macb *lp;

	int res;

	u32 reg;
@@ -319,15 +317,6 @@ static int __init at91ether_probe(struct platform_device *pdev) 
	if (!regs)

		return -ENOENT;



	pinctrl = devm_pinctrl_get_select_default(&pdev->dev);

	if (IS_ERR(pinctrl)) {

		res = PTR_ERR(pinctrl);

		if (res == -EPROBE_DEFER)

			return res;



		dev_warn(&pdev->dev, "No pinctrl provided\n");

	}



	dev = alloc_etherdev(sizeof(struct macb));

	if (!dev)

		return -ENOMEM;