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:
  wm97xx_batery: replace driver_data with dev_get_drvdata()
  omap: video: remove direct access of driver_data
  Sound: remove direct access of driver_data
  driver model: fix show/store prototypes in doc.
  Firmware: firmware_class, fix lock imbalance
  Driver Core: remove BUS_ID_SIZE
  sparc: remove driver-core BUS_ID_SIZE
  partitions: fix broken uevent_suppress conversion
  devres: WARN() and return, don't crash on device_del() of uninitialized device

4 files changed, 16 insertions, 11 deletions

diff --git a/drivers/base/devres.c b/drivers/base/devres.c
index e8beb8e5b626..05dd307e8f02 100644
--- a/drivers/base/devres.c
+++ b/drivers/base/devres.c
@@ -428,6 +428,9 @@ int devres_release_all(struct device *dev)
 {
         unsigned long flags;
 
+        /* Looks like an uninitialized device structure */
+        if (WARN_ON(dev->devres_head.next == NULL))
+                return -ENODEV;
         spin_lock_irqsave(&dev->devres_lock, flags);
         return release_nodes(dev, dev->devres_head.next, &dev->devres_head,
                              flags);
diff --git a/drivers/base/firmware_class.c b/drivers/base/firmware_class.c
index fc466531260e..f285f441fab9 100644
--- a/drivers/base/firmware_class.c
+++ b/drivers/base/firmware_class.c
@@ -217,8 +217,10 @@ firmware_data_read(struct kobject *kobj, struct bin_attribute *bin_attr,
                 ret_count = -ENODEV;
                 goto out;
         }
-        if (offset > fw->size)
-                return 0;
+        if (offset > fw->size) {
+                ret_count = 0;
+                goto out;
+        }
         if (count > fw->size - offset)
                 count = fw->size - offset;
 
diff --git a/drivers/power/wm97xx_battery.c b/drivers/power/wm97xx_battery.c
index 8bde92126d34..b787335a8419 100644
--- a/drivers/power/wm97xx_battery.c
+++ b/drivers/power/wm97xx_battery.c
@@ -33,14 +33,14 @@ static enum power_supply_property *prop;
 
 static unsigned long wm97xx_read_bat(struct power_supply *bat_ps)
 {
-        return wm97xx_read_aux_adc(bat_ps->dev->parent->driver_data,
+        return wm97xx_read_aux_adc(dev_get_drvdata(bat_ps->dev->parent),
                                         pdata->batt_aux) * pdata->batt_mult /
                                         pdata->batt_div;
 }
 
 static unsigned long wm97xx_read_temp(struct power_supply *bat_ps)
 {
-        return wm97xx_read_aux_adc(bat_ps->dev->parent->driver_data,
+        return wm97xx_read_aux_adc(dev_get_drvdata(bat_ps->dev->parent),
                                         pdata->temp_aux) * pdata->temp_mult /
                                         pdata->temp_div;
 }
diff --git a/drivers/video/omap/omapfb_main.c b/drivers/video/omap/omapfb_main.c
index 4ea99bfc37b4..8862233d57b6 100644
--- a/drivers/video/omap/omapfb_main.c
+++ b/drivers/video/omap/omapfb_main.c
@@ -1254,7 +1254,7 @@ static struct fb_ops omapfb_ops = {
 static ssize_t omapfb_show_caps_num(struct device *dev,
                                     struct device_attribute *attr, char *buf)
 {
-        struct omapfb_device *fbdev = (struct omapfb_device *)dev->driver_data;
+        struct omapfb_device *fbdev = dev_get_drvdata(dev);
         int plane;
         size_t size;
         struct omapfb_caps caps;
@@ -1274,7 +1274,7 @@ static ssize_t omapfb_show_caps_num(struct device *dev,
 static ssize_t omapfb_show_caps_text(struct device *dev,
                                      struct device_attribute *attr, char *buf)
 {
-        struct omapfb_device *fbdev = (struct omapfb_device *)dev->driver_data;
+        struct omapfb_device *fbdev = dev_get_drvdata(dev);
         int i;
         struct omapfb_caps caps;
         int plane;
@@ -1321,7 +1321,7 @@ static DEVICE_ATTR(caps_text, 0444, omapfb_show_caps_text, NULL);
 static ssize_t omapfb_show_panel_name(struct device *dev,
                                       struct device_attribute *attr, char *buf)
 {
-        struct omapfb_device *fbdev = (struct omapfb_device *)dev->driver_data;
+        struct omapfb_device *fbdev = dev_get_drvdata(dev);
 
         return snprintf(buf, PAGE_SIZE, "%s\n", fbdev->panel->name);
 }
@@ -1330,7 +1330,7 @@ static ssize_t omapfb_show_bklight_level(struct device *dev,
                                          struct device_attribute *attr,
                                          char *buf)
 {
-        struct omapfb_device *fbdev = (struct omapfb_device *)dev->driver_data;
+        struct omapfb_device *fbdev = dev_get_drvdata(dev);
         int r;
 
         if (fbdev->panel->get_bklight_level) {
@@ -1345,7 +1345,7 @@ static ssize_t omapfb_store_bklight_level(struct device *dev,
                                           struct device_attribute *attr,
                                           const char *buf, size_t size)
 {
-        struct omapfb_device *fbdev = (struct omapfb_device *)dev->driver_data;
+        struct omapfb_device *fbdev = dev_get_drvdata(dev);
         int r;
 
         if (fbdev->panel->set_bklight_level) {
@@ -1364,7 +1364,7 @@ static ssize_t omapfb_store_bklight_level(struct device *dev,
 static ssize_t omapfb_show_bklight_max(struct device *dev,
                                        struct device_attribute *attr, char *buf)
 {
-        struct omapfb_device *fbdev = (struct omapfb_device *)dev->driver_data;
+        struct omapfb_device *fbdev = dev_get_drvdata(dev);
         int r;
 
         if (fbdev->panel->get_bklight_level) {
@@ -1397,7 +1397,7 @@ static struct attribute_group panel_attr_grp = {
 static ssize_t omapfb_show_ctrl_name(struct device *dev,
                                      struct device_attribute *attr, char *buf)
 {
-        struct omapfb_device *fbdev = (struct omapfb_device *)dev->driver_data;
+        struct omapfb_device *fbdev = dev_get_drvdata(dev);
 
         return snprintf(buf, PAGE_SIZE, "%s\n", fbdev->ctrl->name);
 }