mirror of
https://github.com/AuxXxilium/linux_dsm_epyc7002.git
synced 2024-12-13 01:16:44 +07:00
Revert "net/macb: add pinctrl consumer support"
This reverts commit 8ef29f8aae
.
The driver core already calls pinctrl_get() and claims the default
state. There is no need to replicate this in the driver.
Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
40b8fe45d1
commit
9026968abe
@ -30,7 +30,6 @@
|
||||
#include <linux/of_device.h>
|
||||
#include <linux/of_mdio.h>
|
||||
#include <linux/of_net.h>
|
||||
#include <linux/pinctrl/consumer.h>
|
||||
|
||||
#include "macb.h"
|
||||
|
||||
@ -2071,7 +2070,6 @@ static int __init macb_probe(struct platform_device *pdev)
|
||||
struct phy_device *phydev;
|
||||
u32 config;
|
||||
int err = -ENXIO;
|
||||
struct pinctrl *pinctrl;
|
||||
const char *mac;
|
||||
|
||||
regs = platform_get_resource(pdev, IORESOURCE_MEM, 0);
|
||||
@ -2080,15 +2078,6 @@ static int __init macb_probe(struct platform_device *pdev)
|
||||
goto err_out;
|
||||
}
|
||||
|
||||
pinctrl = devm_pinctrl_get_select_default(&pdev->dev);
|
||||
if (IS_ERR(pinctrl)) {
|
||||
err = PTR_ERR(pinctrl);
|
||||
if (err == -EPROBE_DEFER)
|
||||
goto err_out;
|
||||
|
||||
dev_warn(&pdev->dev, "No pinctrl provided\n");
|
||||
}
|
||||
|
||||
err = -ENOMEM;
|
||||
dev = alloc_etherdev(sizeof(*bp));
|
||||
if (!dev)
|
||||
|
Loading…
Reference in New Issue
Block a user