| Message ID | 1386513631-11284-2-git-send-email-sebastian.hesselbarth@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
This series looks good, applied to net-next, thanks.
From: David Miller <davem@davemloft.net> Date: Tue, 10 Dec 2013 21:52:53 -0500 (EST) > > This series looks good, applied to net-next, thanks. Actually, I had to revert. You cannot use late_initcall_sync() from code that is potentially built modular, this caused my build to fail at the mdio_bus code. drivers/net/phy/mdio_bus.c:344:1: warning: data definition has no type or storage class [enabled by default] drivers/net/phy/mdio_bus.c:344:1: error: type defaults to ‘int’ in declaration of ‘late_initcall_sync’ [-Werror=implicit-int] drivers/net/phy/mdio_bus.c:344:1: warning: parameter names (without types) in function declaration [enabled by default] drivers/net/phy/mdio_bus.c:339:12: warning: ‘mdio_bus_class_suspend_unused’ defined but not used [-Wunused-function]
On 12/11/2013 03:56 AM, David Miller wrote: > From: David Miller <davem@davemloft.net> > Date: Tue, 10 Dec 2013 21:52:53 -0500 (EST) > >> >> This series looks good, applied to net-next, thanks. > > Actually, I had to revert. > > You cannot use late_initcall_sync() from code that is potentially > built modular, this caused my build to fail at the mdio_bus code. > > drivers/net/phy/mdio_bus.c:344:1: warning: data definition has no type or storage class [enabled by default] > drivers/net/phy/mdio_bus.c:344:1: error: type defaults to ‘int’ in declaration of ‘late_initcall_sync’ [-Werror=implicit-int] > drivers/net/phy/mdio_bus.c:344:1: warning: parameter names (without types) in function declaration [enabled by default] > drivers/net/phy/mdio_bus.c:339:12: warning: ‘mdio_bus_class_suspend_unused’ defined but not used [-Wunused-function] > Hmm, I see. What about you drop patch 5 ("net: phy: suspend unused PHYs on mdio_bus in late_initcall"), take the rest, and I'll have look at suspending unused PHYs later? Sebastian
From: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com> Date: Wed, 11 Dec 2013 08:06:36 +0100 > On 12/11/2013 03:56 AM, David Miller wrote: >> From: David Miller <davem@davemloft.net> >> Date: Tue, 10 Dec 2013 21:52:53 -0500 (EST) >> >>> >>> This series looks good, applied to net-next, thanks. >> >> Actually, I had to revert. >> >> You cannot use late_initcall_sync() from code that is potentially >> built modular, this caused my build to fail at the mdio_bus code. >> >> drivers/net/phy/mdio_bus.c:344:1: warning: data definition has no type >> or storage class [enabled by default] >> drivers/net/phy/mdio_bus.c:344:1: error: type defaults to ‘int’ in >> declaration of ‘late_initcall_sync’ [-Werror=implicit-int] >> drivers/net/phy/mdio_bus.c:344:1: warning: parameter names (without >> types) in function declaration [enabled by default] >> drivers/net/phy/mdio_bus.c:339:12: warning: >> ‘mdio_bus_class_suspend_unused’ defined but not used >> [-Wunused-function] >> > > Hmm, I see. What about you drop patch 5 ("net: phy: suspend unused > PHYs > on mdio_bus in late_initcall"), take the rest, and I'll have look at > suspending unused PHYs later? What about you resubmit the series that you want me to apply? Thanks.
diff --git a/drivers/net/ethernet/marvell/mv643xx_eth.c b/drivers/net/ethernet/marvell/mv643xx_eth.c index 61088a6..3aa706f 100644 --- a/drivers/net/ethernet/marvell/mv643xx_eth.c +++ b/drivers/net/ethernet/marvell/mv643xx_eth.c @@ -2098,6 +2098,7 @@ static void port_start(struct mv643xx_eth_private *mp) mv643xx_eth_get_settings(mp->dev, &cmd); phy_reset(mp); mv643xx_eth_set_settings(mp->dev, &cmd); + phy_start(mp->phy); } /* @@ -2293,7 +2294,8 @@ static int mv643xx_eth_stop(struct net_device *dev) del_timer_sync(&mp->rx_oom); netif_carrier_off(dev); - + if (mp->phy) + phy_stop(mp->phy); free_irq(dev->irq, dev); port_reset(mp);