| Message ID | 1479400804-9847-8-git-send-email-johan@kernel.org |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
From: Johan Hovold <johan@kernel.org> Date: Thu, 17 Nov 2016 17:40:04 +0100 > Make sure to propagate errors from of_phy_register_fixed_link() which > can fail with -EPROBE_DEFER. > > Fixes: 1f71e8c96fc6 ("drivers: net: cpsw: Add support for fixed-link > PHY") > Signed-off-by: Johan Hovold <johan@kernel.org> Johan, when you update a patch within a series you must post the entire series freshly to the lists, cover posting and all. Thank you.
On Thu, Nov 17, 2016 at 12:04:16PM -0500, David Miller wrote: > From: Johan Hovold <johan@kernel.org> > Date: Thu, 17 Nov 2016 17:40:04 +0100 > > > Make sure to propagate errors from of_phy_register_fixed_link() which > > can fail with -EPROBE_DEFER. > > > > Fixes: 1f71e8c96fc6 ("drivers: net: cpsw: Add support for fixed-link > > PHY") > > Signed-off-by: Johan Hovold <johan@kernel.org> > > Johan, when you update a patch within a series you must post the > entire series freshly to the lists, cover posting and all. I'm quite sure that is exactly what I did. Did you only get this last patch out of the seven? Johan
On Thu, Nov 17, 2016 at 06:19:20PM +0100, Johan Hovold wrote: > On Thu, Nov 17, 2016 at 12:04:16PM -0500, David Miller wrote: > > From: Johan Hovold <johan@kernel.org> > > Date: Thu, 17 Nov 2016 17:40:04 +0100 > > > > > Make sure to propagate errors from of_phy_register_fixed_link() which > > > can fail with -EPROBE_DEFER. > > > > > > Fixes: 1f71e8c96fc6 ("drivers: net: cpsw: Add support for fixed-link > > > PHY") > > > Signed-off-by: Johan Hovold <johan@kernel.org> > > > > Johan, when you update a patch within a series you must post the > > entire series freshly to the lists, cover posting and all. > > I'm quite sure that is exactly what I did. Did you only get this last > patch out of the seven? The full series has made it to the lists: https://marc.info/?l=linux-netdev&m=147940433115984&w=2 Perhaps some messages just got held up. Let me know if you still want me to resend. Thanks, Johan
From: Johan Hovold <johan@kernel.org> Date: Thu, 17 Nov 2016 18:19:20 +0100 > On Thu, Nov 17, 2016 at 12:04:16PM -0500, David Miller wrote: >> From: Johan Hovold <johan@kernel.org> >> Date: Thu, 17 Nov 2016 17:40:04 +0100 >> >> > Make sure to propagate errors from of_phy_register_fixed_link() which >> > can fail with -EPROBE_DEFER. >> > >> > Fixes: 1f71e8c96fc6 ("drivers: net: cpsw: Add support for fixed-link >> > PHY") >> > Signed-off-by: Johan Hovold <johan@kernel.org> >> >> Johan, when you update a patch within a series you must post the >> entire series freshly to the lists, cover posting and all. > > I'm quite sure that is exactly what I did. Did you only get this last > patch out of the seven? I ended up getting it delayed, thanks.
diff --git a/drivers/net/ethernet/ti/cpsw.c b/drivers/net/ethernet/ti/cpsw.c index 1387299030e4..58947aae31c7 100644 --- a/drivers/net/ethernet/ti/cpsw.c +++ b/drivers/net/ethernet/ti/cpsw.c @@ -2375,8 +2375,11 @@ static int cpsw_probe_dt(struct cpsw_platform_data *data, * to the PHY is the Ethernet MAC DT node. */ ret = of_phy_register_fixed_link(slave_node); - if (ret) + if (ret) { + if (ret != -EPROBE_DEFER) + dev_err(&pdev->dev, "failed to register fixed-link phy: %d\n", ret); return ret; + } slave_data->phy_node = of_node_get(slave_node); } else if (parp) { u32 phyid; @@ -2637,11 +2640,10 @@ static int cpsw_probe(struct platform_device *pdev) goto clean_runtime_disable_ret; } - if (cpsw_probe_dt(&cpsw->data, pdev)) { - dev_err(&pdev->dev, "cpsw: platform data missing\n"); - ret = -ENODEV; + ret = cpsw_probe_dt(&cpsw->data, pdev); + if (ret) goto clean_dt_ret; - } + data = &cpsw->data; cpsw->rx_ch_num = 1; cpsw->tx_ch_num = 1;
Make sure to propagate errors from of_phy_register_fixed_link() which can fail with -EPROBE_DEFER. Fixes: 1f71e8c96fc6 ("drivers: net: cpsw: Add support for fixed-link PHY") Signed-off-by: Johan Hovold <johan@kernel.org> --- drivers/net/ethernet/ti/cpsw.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-)