diff options
Diffstat (limited to 'drivers/net/sungem_phy.c')
| -rw-r--r-- | drivers/net/sungem_phy.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/drivers/net/sungem_phy.c b/drivers/net/sungem_phy.c index cb0aba95d4e3..046371ee5bbe 100644 --- a/drivers/net/sungem_phy.c +++ b/drivers/net/sungem_phy.c | |||
| @@ -275,7 +275,7 @@ static int bcm5411_init(struct mii_phy* phy) | |||
| 275 | return 0; | 275 | return 0; |
| 276 | } | 276 | } |
| 277 | 277 | ||
| 278 | static int bcm5411_suspend(struct mii_phy* phy) | 278 | static int generic_suspend(struct mii_phy* phy) |
| 279 | { | 279 | { |
| 280 | phy_write(phy, MII_BMCR, BMCR_PDOWN); | 280 | phy_write(phy, MII_BMCR, BMCR_PDOWN); |
| 281 | 281 | ||
| @@ -738,7 +738,7 @@ static struct mii_phy_def bcm5401_phy_def = { | |||
| 738 | /* Broadcom BCM 5411 */ | 738 | /* Broadcom BCM 5411 */ |
| 739 | static struct mii_phy_ops bcm5411_phy_ops = { | 739 | static struct mii_phy_ops bcm5411_phy_ops = { |
| 740 | .init = bcm5411_init, | 740 | .init = bcm5411_init, |
| 741 | .suspend = bcm5411_suspend, | 741 | .suspend = generic_suspend, |
| 742 | .setup_aneg = bcm54xx_setup_aneg, | 742 | .setup_aneg = bcm54xx_setup_aneg, |
| 743 | .setup_forced = bcm54xx_setup_forced, | 743 | .setup_forced = bcm54xx_setup_forced, |
| 744 | .poll_link = genmii_poll_link, | 744 | .poll_link = genmii_poll_link, |
| @@ -757,7 +757,7 @@ static struct mii_phy_def bcm5411_phy_def = { | |||
| 757 | /* Broadcom BCM 5421 */ | 757 | /* Broadcom BCM 5421 */ |
| 758 | static struct mii_phy_ops bcm5421_phy_ops = { | 758 | static struct mii_phy_ops bcm5421_phy_ops = { |
| 759 | .init = bcm5421_init, | 759 | .init = bcm5421_init, |
| 760 | .suspend = bcm5411_suspend, | 760 | .suspend = generic_suspend, |
| 761 | .setup_aneg = bcm54xx_setup_aneg, | 761 | .setup_aneg = bcm54xx_setup_aneg, |
| 762 | .setup_forced = bcm54xx_setup_forced, | 762 | .setup_forced = bcm54xx_setup_forced, |
| 763 | .poll_link = genmii_poll_link, | 763 | .poll_link = genmii_poll_link, |
| @@ -776,7 +776,7 @@ static struct mii_phy_def bcm5421_phy_def = { | |||
| 776 | /* Broadcom BCM 5421 built-in K2 */ | 776 | /* Broadcom BCM 5421 built-in K2 */ |
| 777 | static struct mii_phy_ops bcm5421k2_phy_ops = { | 777 | static struct mii_phy_ops bcm5421k2_phy_ops = { |
| 778 | .init = bcm5421_init, | 778 | .init = bcm5421_init, |
| 779 | .suspend = bcm5411_suspend, | 779 | .suspend = generic_suspend, |
| 780 | .setup_aneg = bcm54xx_setup_aneg, | 780 | .setup_aneg = bcm54xx_setup_aneg, |
| 781 | .setup_forced = bcm54xx_setup_forced, | 781 | .setup_forced = bcm54xx_setup_forced, |
| 782 | .poll_link = genmii_poll_link, | 782 | .poll_link = genmii_poll_link, |
| @@ -795,7 +795,7 @@ static struct mii_phy_def bcm5421k2_phy_def = { | |||
| 795 | /* Broadcom BCM 5462 built-in Vesta */ | 795 | /* Broadcom BCM 5462 built-in Vesta */ |
| 796 | static struct mii_phy_ops bcm5462V_phy_ops = { | 796 | static struct mii_phy_ops bcm5462V_phy_ops = { |
| 797 | .init = bcm5421_init, | 797 | .init = bcm5421_init, |
| 798 | .suspend = bcm5411_suspend, | 798 | .suspend = generic_suspend, |
| 799 | .setup_aneg = bcm54xx_setup_aneg, | 799 | .setup_aneg = bcm54xx_setup_aneg, |
| 800 | .setup_forced = bcm54xx_setup_forced, | 800 | .setup_forced = bcm54xx_setup_forced, |
| 801 | .poll_link = genmii_poll_link, | 801 | .poll_link = genmii_poll_link, |
| @@ -816,6 +816,7 @@ static struct mii_phy_def bcm5462V_phy_def = { | |||
| 816 | * would be useful here) --BenH. | 816 | * would be useful here) --BenH. |
| 817 | */ | 817 | */ |
| 818 | static struct mii_phy_ops marvell_phy_ops = { | 818 | static struct mii_phy_ops marvell_phy_ops = { |
| 819 | .suspend = generic_suspend, | ||
| 819 | .setup_aneg = marvell_setup_aneg, | 820 | .setup_aneg = marvell_setup_aneg, |
| 820 | .setup_forced = marvell_setup_forced, | 821 | .setup_forced = marvell_setup_forced, |
| 821 | .poll_link = genmii_poll_link, | 822 | .poll_link = genmii_poll_link, |
