1 files changed, 10 insertions, 13 deletions

diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c
index 6b71b0034060..64be4664ccab 100644
--- a/drivers/net/phy/phy.c
+++ b/drivers/net/phy/phy.c
@@ -19,7 +19,6 @@
 #include <linux/string.h>
 #include <linux/errno.h>
 #include <linux/unistd.h>
-#include <linux/slab.h>
 #include <linux/interrupt.h>
 #include <linux/init.h>
 #include <linux/delay.h>
@@ -254,12 +253,12 @@ int phy_ethtool_sset(struct phy_device *phydev, struct ethtool_cmd *cmd)
         if (cmd->autoneg == AUTONEG_ENABLE && cmd->advertising == 0)
                 return -EINVAL;
 
-        if (cmd->autoneg == AUTONEG_DISABLE
-                        && ((cmd->speed != SPEED_1000
-                                        && cmd->speed != SPEED_100
-                                        && cmd->speed != SPEED_10)
-                                || (cmd->duplex != DUPLEX_HALF
-                                        && cmd->duplex != DUPLEX_FULL)))
+        if (cmd->autoneg == AUTONEG_DISABLE &&
+            ((cmd->speed != SPEED_1000 &&
+              cmd->speed != SPEED_100 &&
+              cmd->speed != SPEED_10) ||
+             (cmd->duplex != DUPLEX_HALF &&
+              cmd->duplex != DUPLEX_FULL)))
                 return -EINVAL;
 
         phydev->autoneg = cmd->autoneg;
@@ -353,9 +352,9 @@ int phy_mii_ioctl(struct phy_device *phydev,
 
                 phy_write(phydev, mii_data->reg_num, val);
                 
-                if (mii_data->reg_num == MII_BMCR 
-                                && val & BMCR_RESET
-                                && phydev->drv->config_init) {
+                if (mii_data->reg_num == MII_BMCR &&
+                    val & BMCR_RESET &&
+                    phydev->drv->config_init) {
                         phy_scan_fixups(phydev);
                         phydev->drv->config_init(phydev);
                 }
@@ -410,7 +409,6 @@ EXPORT_SYMBOL(phy_start_aneg);
 
 
 static void phy_change(struct work_struct *work);
-static void phy_state_machine(struct work_struct *work);
 
 /**
  * phy_start_machine - start PHY state machine tracking
@@ -430,7 +428,6 @@ void phy_start_machine(struct phy_device *phydev,
 {
         phydev->adjust_state = handler;
 
-        INIT_DELAYED_WORK(&phydev->state_queue, phy_state_machine);
         schedule_delayed_work(&phydev->state_queue, HZ);
 }
 
@@ -761,7 +758,7 @@ EXPORT_SYMBOL(phy_start);
  * phy_state_machine - Handle the state machine
  * @work: work_struct that describes the work to be done
  */
-static void phy_state_machine(struct work_struct *work)
+void phy_state_machine(struct work_struct *work)
 {
         struct delayed_work *dwork = to_delayed_work(work);
         struct phy_device *phydev =