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

* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-2.6: (36 commits)
  SCSI: convert struct class_device to struct device
  DRM: remove unused dev_class
  IB: rename "dev" to "srp_dev" in srp_host structure
  IB: convert struct class_device to struct device
  memstick: convert struct class_device to struct device
  driver core: replace remaining __FUNCTION__ occurrences
  sysfs: refill attribute buffer when reading from offset 0
  PM: Remove destroy_suspended_device()
  Firmware: add iSCSI iBFT Support
  PM: Remove legacy PM (fix)
  Kobject: Replace list_for_each() with list_for_each_entry().
  SYSFS: Explicitly include required header file slab.h.
  Driver core: make device_is_registered() work for class devices
  PM: Convert wakeup flag accessors to inline functions
  PM: Make wakeup flags available whenever CONFIG_PM is set
  PM: Fix misuse of wakeup flag accessors in serial core
  Driver core: Call device_pm_add() after bus_add_device() in device_add()
  PM: Handle device registrations during suspend/resume
  block: send disk "change" event for rescan_partitions()
  sysdev: detect multiple driver registrations
  ...

Fixed trivial conflict in include/linux/memory.h due to semaphore header
file change (made irrelevant by the change to mutex).

1 files changed, 6 insertions, 7 deletions

diff --git a/drivers/scsi/ch.c b/drivers/scsi/ch.c
index 92d1cb1b21cb..75c84d7b9ce8 100644
--- a/drivers/scsi/ch.c
+++ b/drivers/scsi/ch.c
@@ -881,7 +881,7 @@ static long ch_ioctl_compat(struct file * file,
 static int ch_probe(struct device *dev)
 {
         struct scsi_device *sd = to_scsi_device(dev);
-        struct class_device *class_dev;
+        struct device *class_dev;
         int minor, ret = -ENOMEM;
         scsi_changer *ch;
 
@@ -910,11 +910,11 @@ static int ch_probe(struct device *dev)
         ch->minor = minor;
         sprintf(ch->name,"ch%d",ch->minor);
 
-        class_dev = class_device_create(ch_sysfs_class, NULL,
-                                        MKDEV(SCSI_CHANGER_MAJOR, ch->minor),
-                                        dev, "s%s", ch->name);
+        class_dev = device_create(ch_sysfs_class, dev,
+                                  MKDEV(SCSI_CHANGER_MAJOR,ch->minor),
+                                  "s%s", ch->name);
         if (IS_ERR(class_dev)) {
-                printk(KERN_WARNING "ch%d: class_device_create failed\n",
+                printk(KERN_WARNING "ch%d: device_create failed\n",
                        ch->minor);
                 ret = PTR_ERR(class_dev);
                 goto remove_idr;
@@ -945,8 +945,7 @@ static int ch_remove(struct device *dev)
         idr_remove(&ch_index_idr, ch->minor);
         spin_unlock(&ch_index_lock);
 
-        class_device_destroy(ch_sysfs_class,
-                             MKDEV(SCSI_CHANGER_MAJOR,ch->minor));
+        device_destroy(ch_sysfs_class, MKDEV(SCSI_CHANGER_MAJOR,ch->minor));
         kfree(ch->dt);
         kfree(ch);
         return 0;