Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6

* master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6: (46 commits)
  dev_dbg: check dev_dbg() arguments
  drivers/base/attribute_container.c: use mutex instead of binary semaphore
  mod_sysfs_setup() doesn't return errno when kobject_add_dir() failure occurs
  s2ram: add arch irq disable/enable hooks
  define platform wakeup hook, use in pci_enable_wake()
  security: prevent permission checking of file removal via sysfs_remove_group()
  device_schedule_callback() needs a module reference
  s390: cio: Delay uevents for subchannels
  sysfs: bin.c printk fix
  Driver core: use mutex instead of semaphore in DMA pool handler
  driver core: bus_add_driver should return an error if no bus
  debugfs: Add debugfs_create_u64()
  the overdue removal of the mount/umount uevents
  kobject: Comment and warning fixes to kobject.c
  Driver core: warn when userspace writes to the uevent file in a non-supported way
  Driver core: make uevent-environment available in uevent-file
  kobject core: remove rwsem from struct subsystem
  qeth: Remove usage of subsys.rwsem
  PHY: remove rwsem use from phy core
  IEEE1394: remove rwsem use from ieee1394 core
  ...

1 files changed, 0 insertions, 6 deletions

diff --git a/drivers/net/phy/fixed.c b/drivers/net/phy/fixed.c
index 66da91bb1388..68c99b4c5255 100644
--- a/drivers/net/phy/fixed.c
+++ b/drivers/net/phy/fixed.c
@@ -276,21 +276,15 @@ static int fixed_mdio_register_device(int number, int speed, int duplex)
            artificially, we are binding the driver here by hand;
            it will be the same for all the fixed phys anyway.
          */
-        down_write(&phydev->dev.bus->subsys.rwsem);
-
         phydev->dev.driver = &fixed_mdio_driver.driver;
 
         err = phydev->dev.driver->probe(&phydev->dev);
         if(err < 0) {
                 printk(KERN_ERR "Phy %s: problems with fixed driver\n",phydev->dev.bus_id);
-                up_write(&phydev->dev.bus->subsys.rwsem);
                 goto probe_fail;
         }
 
         err = device_bind_driver(&phydev->dev);
-
-        up_write(&phydev->dev.bus->subsys.rwsem);
-
         if (err)
                 goto probe_fail;