* [PATCHv2 net-next] net: stmmac: make reset control an optional requirement
@ 2015-03-06 23:48 dinguyen
2015-03-09 2:53 ` David Miller
0 siblings, 1 reply; 2+ messages in thread
From: dinguyen @ 2015-03-06 23:48 UTC (permalink / raw)
To: peppe.cavallaro
Cc: dinh.linux, netdev, linux-kernel, Dinh Nguyen, Vince Bridgers,
David S. Miller
From: Dinh Nguyen <dinguyen@opensource.altera.com>
Not having a reset control line to the ethernet controller should not be a
hard failure. Instead, add support for deferred probing and just print out
a debug statement.
Signed-off-by: Dinh Nguyen <dinguyen@opensource.altera.com>
Cc: Vince Bridgers <vbridger@opensource.altera.com>
CC: David S. Miller <davem@davemloft.net>
---
v2: return EPROBE_DEFER directly as 'ret' is not used as return variable
---
drivers/net/ethernet/stmicro/stmmac/dwmac-socfpga.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-socfpga.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-socfpga.c
index 3aad413..9987b34 100644
--- a/drivers/net/ethernet/stmicro/stmmac/dwmac-socfpga.c
+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-socfpga.c
@@ -89,7 +89,9 @@ static int socfpga_dwmac_parse_data(struct socfpga_dwmac *dwmac, struct device *
STMMAC_RESOURCE_NAME);
if (IS_ERR(dwmac->stmmac_rst)) {
dev_info(dev, "Could not get reset control!\n");
- return -EINVAL;
+ if (PTR_ERR(dwmac->stmmac_rst) == -EPROBE_DEFER)
+ return -EPROBE_DEFER;
+ dwmac->stmmac_rst = NULL;
}
dwmac->interface = of_get_phy_mode(np);
--
2.2.1
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PATCHv2 net-next] net: stmmac: make reset control an optional requirement
2015-03-06 23:48 [PATCHv2 net-next] net: stmmac: make reset control an optional requirement dinguyen
@ 2015-03-09 2:53 ` David Miller
0 siblings, 0 replies; 2+ messages in thread
From: David Miller @ 2015-03-09 2:53 UTC (permalink / raw)
To: dinguyen; +Cc: peppe.cavallaro, dinh.linux, netdev, linux-kernel, vbridger
From: <dinguyen@opensource.altera.com>
Date: Fri, 6 Mar 2015 17:48:28 -0600
> From: Dinh Nguyen <dinguyen@opensource.altera.com>
>
> Not having a reset control line to the ethernet controller should not be a
> hard failure. Instead, add support for deferred probing and just print out
> a debug statement.
>
> Signed-off-by: Dinh Nguyen <dinguyen@opensource.altera.com>
Applied, thanks.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2015-03-09 2:53 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-03-06 23:48 [PATCHv2 net-next] net: stmmac: make reset control an optional requirement dinguyen
2015-03-09 2:53 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®