Merge commit 'origin'

Manual fixup of conflicts on:

	arch/powerpc/include/asm/dcr-regs.h
	drivers/net/ibm_newemac/core.h

1 files changed, 9 insertions, 51 deletions

diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c
index 45cc2914d347..df4e6257d4a7 100644
--- a/drivers/net/phy/phy.c
+++ b/drivers/net/phy/phy.c
@@ -58,55 +58,6 @@ EXPORT_SYMBOL(phy_print_status);
 
 
 /**
- * phy_read - Convenience function for reading a given PHY register
- * @phydev: the phy_device struct
- * @regnum: register number to read
- *
- * NOTE: MUST NOT be called from interrupt context,
- * because the bus read/write functions may wait for an interrupt
- * to conclude the operation.
- */
-int phy_read(struct phy_device *phydev, u16 regnum)
-{
-        int retval;
-        struct mii_bus *bus = phydev->bus;
-
-        BUG_ON(in_interrupt());
-
-        mutex_lock(&bus->mdio_lock);
-        retval = bus->read(bus, phydev->addr, regnum);
-        mutex_unlock(&bus->mdio_lock);
-
-        return retval;
-}
-EXPORT_SYMBOL(phy_read);
-
-/**
- * phy_write - Convenience function for writing a given PHY register
- * @phydev: the phy_device struct
- * @regnum: register number to write
- * @val: value to write to @regnum
- *
- * NOTE: MUST NOT be called from interrupt context,
- * because the bus read/write functions may wait for an interrupt
- * to conclude the operation.
- */
-int phy_write(struct phy_device *phydev, u16 regnum, u16 val)
-{
-        int err;
-        struct mii_bus *bus = phydev->bus;
-
-        BUG_ON(in_interrupt());
-
-        mutex_lock(&bus->mdio_lock);
-        err = bus->write(bus, phydev->addr, regnum, val);
-        mutex_unlock(&bus->mdio_lock);
-
-        return err;
-}
-EXPORT_SYMBOL(phy_write);
-
-/**
  * phy_clear_interrupt - Ack the phy device's interrupt
  * @phydev: the phy_device struct
  *
@@ -366,7 +317,8 @@ int phy_mii_ioctl(struct phy_device *phydev,
         switch (cmd) {
         case SIOCGMIIPHY:
                 mii_data->phy_id = phydev->addr;
-                break;
+                /* fall through */
+
         case SIOCGMIIREG:
                 mii_data->val_out = phy_read(phydev, mii_data->reg_num);
                 break;
@@ -413,7 +365,7 @@ int phy_mii_ioctl(struct phy_device *phydev,
                 break;
 
         default:
-                return -ENOTTY;
+                return -EOPNOTSUPP;
         }
 
         return 0;
@@ -728,6 +680,12 @@ static void phy_change(struct work_struct *work)
         if (err)
                 goto irq_enable_err;
 
+        /* Stop timer and run the state queue now.  The work function for
+         * state_queue will start the timer up again.
+         */
+        del_timer(&phydev->phy_timer);
+        schedule_work(&phydev->state_queue);
+
         return;
 
 irq_enable_err: