1 files changed, 19 insertions, 18 deletions

diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c
index 1bb16cb79433..a47595760751 100644
--- a/drivers/net/phy/phy.c
+++ b/drivers/net/phy/phy.c
@@ -47,11 +47,11 @@ void phy_print_status(struct phy_device *phydev)
         pr_info("PHY: %s - Link is %s", dev_name(&phydev->dev),
                         phydev->link ? "Up" : "Down");
         if (phydev->link)
-                printk(" - %d/%s", phydev->speed,
+                printk(KERN_CONT " - %d/%s", phydev->speed,
                                 DUPLEX_FULL == phydev->duplex ?
                                 "Full" : "Half");
 
-        printk("\n");
+        printk(KERN_CONT "\n");
 }
 EXPORT_SYMBOL(phy_print_status);
 
@@ -65,7 +65,7 @@ EXPORT_SYMBOL(phy_print_status);
  *
  * Returns 0 on success on < 0 on error.
  */
-int phy_clear_interrupt(struct phy_device *phydev)
+static int phy_clear_interrupt(struct phy_device *phydev)
 {
         int err = 0;
 
@@ -82,7 +82,7 @@ int phy_clear_interrupt(struct phy_device *phydev)
  *
  * Returns 0 on success on < 0 on error.
  */
-int phy_config_interrupt(struct phy_device *phydev, u32 interrupts)
+static int phy_config_interrupt(struct phy_device *phydev, u32 interrupts)
 {
         int err = 0;
 
@@ -208,7 +208,7 @@ static inline int phy_find_valid(int idx, u32 features)
  *   duplexes.  Drop down by one in this order:  1000/FULL,
  *   1000/HALF, 100/FULL, 100/HALF, 10/FULL, 10/HALF.
  */
-void phy_sanitize_settings(struct phy_device *phydev)
+static void phy_sanitize_settings(struct phy_device *phydev)
 {
         u32 features = phydev->supported;
         int idx;
@@ -223,7 +223,6 @@ void phy_sanitize_settings(struct phy_device *phydev)
         phydev->speed = settings[idx].speed;
         phydev->duplex = settings[idx].duplex;
 }
-EXPORT_SYMBOL(phy_sanitize_settings);
 
 /**
  * phy_ethtool_sset - generic ethtool sset function, handles all the details
@@ -239,6 +238,8 @@ EXPORT_SYMBOL(phy_sanitize_settings);
  */
 int phy_ethtool_sset(struct phy_device *phydev, struct ethtool_cmd *cmd)
 {
+        u32 speed = ethtool_cmd_speed(cmd);
+
         if (cmd->phy_address != phydev->addr)
                 return -EINVAL;
 
@@ -254,16 +255,16 @@ int phy_ethtool_sset(struct phy_device *phydev, struct ethtool_cmd *cmd)
                 return -EINVAL;
 
         if (cmd->autoneg == AUTONEG_DISABLE &&
-            ((cmd->speed != SPEED_1000 &&
-              cmd->speed != SPEED_100 &&
-              cmd->speed != SPEED_10) ||
+            ((speed != SPEED_1000 &&
+              speed != SPEED_100 &&
+              speed != SPEED_10) ||
              (cmd->duplex != DUPLEX_HALF &&
               cmd->duplex != DUPLEX_FULL)))
                 return -EINVAL;
 
         phydev->autoneg = cmd->autoneg;
 
-        phydev->speed = cmd->speed;
+        phydev->speed = speed;
 
         phydev->advertising = cmd->advertising;
 
@@ -287,7 +288,7 @@ int phy_ethtool_gset(struct phy_device *phydev, struct ethtool_cmd *cmd)
 
         cmd->advertising = phydev->advertising;
 
-        cmd->speed = phydev->speed;
+        ethtool_cmd_speed_set(cmd, phydev->speed);
         cmd->duplex = phydev->duplex;
         cmd->port = PORT_MII;
         cmd->phy_address = phydev->addr;
@@ -320,7 +321,8 @@ int phy_mii_ioctl(struct phy_device *phydev,
                 /* fall through */
 
         case SIOCGMIIREG:
-                mii_data->val_out = phy_read(phydev, mii_data->reg_num);
+                mii_data->val_out = mdiobus_read(phydev->bus, mii_data->phy_id,
+                                                 mii_data->reg_num);
                 break;
 
         case SIOCSMIIREG:
@@ -351,8 +353,9 @@ int phy_mii_ioctl(struct phy_device *phydev,
                         }
                 }
 
-                phy_write(phydev, mii_data->reg_num, val);
-                
+                mdiobus_write(phydev->bus, mii_data->phy_id,
+                              mii_data->reg_num, val);
+
                 if (mii_data->reg_num == MII_BMCR &&
                     val & BMCR_RESET &&
                     phydev->drv->config_init) {
@@ -532,7 +535,7 @@ static irqreturn_t phy_interrupt(int irq, void *phy_dat)
  * phy_enable_interrupts - Enable the interrupts from the PHY side
  * @phydev: target phy_device struct
  */
-int phy_enable_interrupts(struct phy_device *phydev)
+static int phy_enable_interrupts(struct phy_device *phydev)
 {
         int err;
 
@@ -545,13 +548,12 @@ int phy_enable_interrupts(struct phy_device *phydev)
 
         return err;
 }
-EXPORT_SYMBOL(phy_enable_interrupts);
 
 /**
  * phy_disable_interrupts - Disable the PHY interrupts from the PHY side
  * @phydev: target phy_device struct
  */
-int phy_disable_interrupts(struct phy_device *phydev)
+static int phy_disable_interrupts(struct phy_device *phydev)
 {
         int err;
 
@@ -574,7 +576,6 @@ phy_err:
 
         return err;
 }
-EXPORT_SYMBOL(phy_disable_interrupts);
 
 /**
  * phy_start_interrupts - request and enable interrupts for a PHY device