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, 5 insertions, 15 deletions

diff --git a/drivers/pcmcia/ds.c b/drivers/pcmcia/ds.c
index 47cab31ff6e4..304ff6d5cf3b 100644
--- a/drivers/pcmcia/ds.c
+++ b/drivers/pcmcia/ds.c
@@ -394,7 +394,7 @@ static int pcmcia_device_probe(struct device * dev)
         p_drv = to_pcmcia_drv(dev->driver);
         s = p_dev->socket;
 
-        /* The PCMCIA code passes the match data in via dev->driver_data
+        /* The PCMCIA code passes the match data in via dev_set_drvdata(dev)
          * which is an ugly hack. Once the driver probe is called it may
          * and often will overwrite the match data so we must save it first
          *
@@ -404,7 +404,7 @@ static int pcmcia_device_probe(struct device * dev)
          * call which will then check whether there are two
          * pseudo devices, and if not, add the second one.
          */
-        did = p_dev->dev.driver_data;
+        did = dev_get_drvdata(&p_dev->dev);
 
         ds_dev_dbg(1, dev, "trying to bind to %s\n", p_drv->drv.name);
 
@@ -499,7 +499,7 @@ static int pcmcia_device_remove(struct device * dev)
          * pseudo multi-function card, we need to unbind
          * all devices
          */
-        did = p_dev->dev.driver_data;
+        did = dev_get_drvdata(&p_dev->dev);
         if (did && (did->match_flags & PCMCIA_DEV_ID_MATCH_DEVICE_NO) &&
             (p_dev->socket->device_count != 0) &&
             (p_dev->device_no == 0))
@@ -828,7 +828,6 @@ static int pcmcia_load_firmware(struct pcmcia_device *dev, char * filename)
 {
         struct pcmcia_socket *s = dev->socket;
         const struct firmware *fw;
-        char path[FIRMWARE_NAME_MAX];
         int ret = -ENOMEM;
         int no_funcs;
         int old_funcs;
@@ -839,16 +838,7 @@ static int pcmcia_load_firmware(struct pcmcia_device *dev, char * filename)
 
         ds_dev_dbg(1, &dev->dev, "trying to load CIS file %s\n", filename);
 
-        if (strlen(filename) > (FIRMWARE_NAME_MAX - 1)) {
-                dev_printk(KERN_WARNING, &dev->dev,
-                           "pcmcia: CIS filename is too long [%s]\n",
-                           filename);
-                return -EINVAL;
-        }
-
-        snprintf(path, sizeof(path), "%s", filename);
-
-        if (request_firmware(&fw, path, &dev->dev) == 0) {
+        if (request_firmware(&fw, filename, &dev->dev) == 0) {
                 if (fw->size >= CISTPL_MAX_CIS_SIZE) {
                         ret = -EINVAL;
                         dev_printk(KERN_ERR, &dev->dev,
@@ -988,7 +978,7 @@ static inline int pcmcia_devmatch(struct pcmcia_device *dev,
                         return 0;
         }
 
-        dev->dev.driver_data = (void *) did;
+        dev_set_drvdata(&dev->dev, did);
 
         return 1;
 }