aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/jme.c
diff options
context:
space:
mode:
authorGuo-Fu Tseng <cooldavid@cooldavid.org>2011-02-13 13:27:37 -0500
committerDavid S. Miller <davem@davemloft.net>2011-02-13 23:43:21 -0500
commit51754572371491b63f70aae41dab70dfcaf771b2 (patch)
tree91da601a34b35fd15d497b7466a66de7d670418f /drivers/net/jme.c
parent3c2368d96fd9a5828b260dfec59ae9a5352cd598 (diff)
jme: Rename phyfifo function for easier understand
Signed-off-by: Guo-Fu Tseng <cooldavid@cooldavid.org> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/jme.c')
-rw-r--r--drivers/net/jme.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/net/jme.c b/drivers/net/jme.c
index d446fdb89f68..490bc0feff3d 100644
--- a/drivers/net/jme.c
+++ b/drivers/net/jme.c
@@ -336,13 +336,13 @@ jme_linkstat_from_phy(struct jme_adapter *jme)
336} 336}
337 337
338static inline void 338static inline void
339jme_set_phyfifoa(struct jme_adapter *jme) 339jme_set_phyfifo_5level(struct jme_adapter *jme)
340{ 340{
341 jme_mdio_write(jme->dev, jme->mii_if.phy_id, 27, 0x0004); 341 jme_mdio_write(jme->dev, jme->mii_if.phy_id, 27, 0x0004);
342} 342}
343 343
344static inline void 344static inline void
345jme_set_phyfifob(struct jme_adapter *jme) 345jme_set_phyfifo_8level(struct jme_adapter *jme)
346{ 346{
347 jme_mdio_write(jme->dev, jme->mii_if.phy_id, 27, 0x0000); 347 jme_mdio_write(jme->dev, jme->mii_if.phy_id, 27, 0x0000);
348} 348}
@@ -457,15 +457,15 @@ jme_check_link(struct net_device *netdev, int testonly)
457 gpreg1 |= GPREG1_HALFMODEPATCH; 457 gpreg1 |= GPREG1_HALFMODEPATCH;
458 switch (phylink & PHY_LINK_SPEED_MASK) { 458 switch (phylink & PHY_LINK_SPEED_MASK) {
459 case PHY_LINK_SPEED_10M: 459 case PHY_LINK_SPEED_10M:
460 jme_set_phyfifoa(jme); 460 jme_set_phyfifo_8level(jme);
461 gpreg1 |= GPREG1_RSSPATCH; 461 gpreg1 |= GPREG1_RSSPATCH;
462 break; 462 break;
463 case PHY_LINK_SPEED_100M: 463 case PHY_LINK_SPEED_100M:
464 jme_set_phyfifob(jme); 464 jme_set_phyfifo_5level(jme);
465 gpreg1 |= GPREG1_RSSPATCH; 465 gpreg1 |= GPREG1_RSSPATCH;
466 break; 466 break;
467 case PHY_LINK_SPEED_1000M: 467 case PHY_LINK_SPEED_1000M:
468 jme_set_phyfifoa(jme); 468 jme_set_phyfifo_8level(jme);
469 break; 469 break;
470 default: 470 default:
471 break; 471 break;
@@ -2979,7 +2979,7 @@ jme_init_one(struct pci_dev *pdev,
2979 jme->mii_if.mdio_write = jme_mdio_write; 2979 jme->mii_if.mdio_write = jme_mdio_write;
2980 2980
2981 jme_clear_pm(jme); 2981 jme_clear_pm(jme);
2982 jme_set_phyfifoa(jme); 2982 jme_set_phyfifo_5level(jme);
2983 pci_read_config_byte(pdev, PCI_REVISION_ID, &jme->pcirev); 2983 pci_read_config_byte(pdev, PCI_REVISION_ID, &jme->pcirev);
2984 if (!jme->fpgaver) 2984 if (!jme->fpgaver)
2985 jme_phy_init(jme); 2985 jme_phy_init(jme);