aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFlorian Fainelli <f.fainelli@gmail.com>2014-08-14 19:52:53 -0400
committerDavid S. Miller <davem@greenl8ke.davemloft.net>2014-08-16 22:13:33 -0400
commit82c084f56a01160afa39d4b6899b66c7153d0002 (patch)
treef30ecee25e4f64fa837c827154ab15095ec3785c
parent4fd14e0b4a4fdb57a2b96659cb8adae255cd225d (diff)
net: phy: bcm7xxx: remove suspend callback for 28nm PHYs
BCM7xxx internal Gigabit PHY on 28nm process do not need anything special to be done during suspend, remove the suspend callback since it might be harmful rather than useful. While at it, update the comment above bcm7xxx_suspend() to reflect that it applies only to 40nm and 65nm process PHY devices. Fixes: b560a58c45c6 ("net: phy: add Broadcom BCM7xxx internal PHY driver") Signed-off-by: Florian Fainelli <f.fainelli@gmail.com> Signed-off-by: David S. Miller <davem@greenl8ke.davemloft.net>
-rw-r--r--drivers/net/phy/bcm7xxx.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/net/phy/bcm7xxx.c b/drivers/net/phy/bcm7xxx.c
index a8ca03ff4f1e..fdce1ea28790 100644
--- a/drivers/net/phy/bcm7xxx.c
+++ b/drivers/net/phy/bcm7xxx.c
@@ -229,7 +229,7 @@ static int bcm7xxx_config_init(struct phy_device *phydev)
229} 229}
230 230
231/* Workaround for putting the PHY in IDDQ mode, required 231/* Workaround for putting the PHY in IDDQ mode, required
232 * for all BCM7XXX PHYs 232 * for all BCM7XXX 40nm and 65nm PHYs
233 */ 233 */
234static int bcm7xxx_suspend(struct phy_device *phydev) 234static int bcm7xxx_suspend(struct phy_device *phydev)
235{ 235{
@@ -274,7 +274,6 @@ static struct phy_driver bcm7xxx_driver[] = {
274 .config_init = bcm7xxx_28nm_afe_config_init, 274 .config_init = bcm7xxx_28nm_afe_config_init,
275 .config_aneg = genphy_config_aneg, 275 .config_aneg = genphy_config_aneg,
276 .read_status = genphy_read_status, 276 .read_status = genphy_read_status,
277 .suspend = bcm7xxx_suspend,
278 .resume = bcm7xxx_28nm_resume, 277 .resume = bcm7xxx_28nm_resume,
279 .driver = { .owner = THIS_MODULE }, 278 .driver = { .owner = THIS_MODULE },
280}, { 279}, {
@@ -287,7 +286,6 @@ static struct phy_driver bcm7xxx_driver[] = {
287 .config_init = bcm7xxx_28nm_afe_config_init, 286 .config_init = bcm7xxx_28nm_afe_config_init,
288 .config_aneg = genphy_config_aneg, 287 .config_aneg = genphy_config_aneg,
289 .read_status = genphy_read_status, 288 .read_status = genphy_read_status,
290 .suspend = bcm7xxx_suspend,
291 .resume = bcm7xxx_28nm_resume, 289 .resume = bcm7xxx_28nm_resume,
292 .driver = { .owner = THIS_MODULE }, 290 .driver = { .owner = THIS_MODULE },
293}, { 291}, {
@@ -300,7 +298,6 @@ static struct phy_driver bcm7xxx_driver[] = {
300 .config_init = bcm7xxx_28nm_config_init, 298 .config_init = bcm7xxx_28nm_config_init,
301 .config_aneg = genphy_config_aneg, 299 .config_aneg = genphy_config_aneg,
302 .read_status = genphy_read_status, 300 .read_status = genphy_read_status,
303 .suspend = bcm7xxx_suspend,
304 .resume = bcm7xxx_28nm_afe_config_init, 301 .resume = bcm7xxx_28nm_afe_config_init,
305 .driver = { .owner = THIS_MODULE }, 302 .driver = { .owner = THIS_MODULE },
306}, { 303}, {