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

* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6: (64 commits)
  debugfs: use specified mode to possibly mark files read/write only
  debugfs: Fix terminology inconsistency of dir name to mount debugfs filesystem.
  xen: remove driver_data direct access of struct device from more drivers
  usb: gadget: at91_udc: remove driver_data direct access of struct device
  uml: remove driver_data direct access of struct device
  block/ps3: remove driver_data direct access of struct device
  s390: remove driver_data direct access of struct device
  parport: remove driver_data direct access of struct device
  parisc: remove driver_data direct access of struct device
  of_serial: remove driver_data direct access of struct device
  mips: remove driver_data direct access of struct device
  ipmi: remove driver_data direct access of struct device
  infiniband: ehca: remove driver_data direct access of struct device
  ibmvscsi: gadget: at91_udc: remove driver_data direct access of struct device
  hvcs: remove driver_data direct access of struct device
  xen block: remove driver_data direct access of struct device
  thermal: remove driver_data direct access of struct device
  scsi: remove driver_data direct access of struct device
  pcmcia: remove driver_data direct access of struct device
  PCIE: remove driver_data direct access of struct device
  ...

Manually fix up trivial conflicts due to different direct driver_data
direct access fixups in drivers/block/{ps3disk.c,ps3vram.c}

1 files changed, 4 insertions, 4 deletions

diff --git a/drivers/ieee1394/sbp2.c b/drivers/ieee1394/sbp2.c
index a51ab233342d..83b734aec923 100644
--- a/drivers/ieee1394/sbp2.c
+++ b/drivers/ieee1394/sbp2.c
@@ -718,7 +718,7 @@ static int sbp2_remove(struct device *dev)
         struct scsi_device *sdev;
 
         ud = container_of(dev, struct unit_directory, device);
-        lu = ud->device.driver_data;
+        lu = dev_get_drvdata(&ud->device);
         if (!lu)
                 return 0;
 
@@ -746,7 +746,7 @@ static int sbp2_remove(struct device *dev)
 
 static int sbp2_update(struct unit_directory *ud)
 {
-        struct sbp2_lu *lu = ud->device.driver_data;
+        struct sbp2_lu *lu = dev_get_drvdata(&ud->device);
 
         if (sbp2_reconnect_device(lu) != 0) {
                 /*
@@ -815,7 +815,7 @@ static struct sbp2_lu *sbp2_alloc_device(struct unit_directory *ud)
         atomic_set(&lu->state, SBP2LU_STATE_RUNNING);
         INIT_WORK(&lu->protocol_work, NULL);
 
-        ud->device.driver_data = lu;
+        dev_set_drvdata(&ud->device, lu);
 
         hi = hpsb_get_hostinfo(&sbp2_highlevel, ud->ne->host);
         if (!hi) {
@@ -1051,7 +1051,7 @@ static void sbp2_remove_device(struct sbp2_lu *lu)
                 hpsb_unregister_addrspace(&sbp2_highlevel, hi->host,
                                           lu->status_fifo_addr);
 
-        lu->ud->device.driver_data = NULL;
+        dev_set_drvdata(&lu->ud->device, NULL);
 
         module_put(hi->host->driver->owner);
 no_hi: