diff options
11 files changed, 1 insertions, 390 deletions
diff --git a/driver-core.current/devres-warn-and-return-don-t-crash-on-device_del-of-uninitialized-device.patch b/driver-core.current/devres-warn-and-return-don-t-crash-on-device_del-of-uninitialized-device.patch deleted file mode 100644 index c10c3731d0f470..00000000000000 --- a/driver-core.current/devres-warn-and-return-don-t-crash-on-device_del-of-uninitialized-device.patch +++ /dev/null @@ -1,39 +0,0 @@ -From akpm@linux-foundation.org Tue Jun 23 14:50:09 2009 -From: akpm@linux-foundation.org -Date: Wed, 10 Jun 2009 12:43:02 -0700 -Subject: devres: WARN() and return, don't crash on device_del() of uninitialized device -To: greg@kroah.com -Cc: akpm@linux-foundation.org, benh@kernel.crashing.org, kay.sievers@vrfy.org, tj@kernel.org -Message-ID: <200906101943.n5AJh3Qu030728@imap1.linux-foundation.org> - - -From: Benjamin Herrenschmidt <benh@kernel.crashing.org> - -I just debugged an obscure crash caused by a device_del() of a all NULL'd -out struct device (in usb-serial) and found that a patch like this one would -have saved me time (in addition to improved chances of a bug report from -users hitting similar driver bugs). - -[akpm@linux-foundation.org: cleanup] -Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> -Cc: Kay Sievers <kay.sievers@vrfy.org> -Cc: Tejun Heo <tj@kernel.org> -Signed-off-by: Andrew Morton <akpm@linux-foundation.org> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - ---- - drivers/base/devres.c | 3 +++ - 1 file changed, 3 insertions(+) - ---- a/drivers/base/devres.c -+++ b/drivers/base/devres.c -@@ -428,6 +428,9 @@ int devres_release_all(struct device *de - { - 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/driver-core.current/driver-core-remove-bus_id_size.patch b/driver-core.current/driver-core-remove-bus_id_size.patch deleted file mode 100644 index 48161d872f33b6..00000000000000 --- a/driver-core.current/driver-core-remove-bus_id_size.patch +++ /dev/null @@ -1,31 +0,0 @@ -From kay.sievers@vrfy.org Thu Jul 2 14:44:01 2009 -From: Kay Sievers <kay.sievers@vrfy.org> -Date: Thu, 02 Jul 2009 23:25:44 +0200 -Subject: Driver Core: remove BUS_ID_SIZE -To: Greg KH <greg@kroah.com> -Message-ID: <1246569944.1896.2.camel@yio.site> - - -From: Kay Sievers <kay.sievers@vrfy.org> - -The name size limit is gone from the driver-core, this is -the removal of the last left-over. - -Signed-off-by: Kay Sievers <kay.sievers@vrfy.org> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - ---- - include/linux/device.h | 2 -- - 1 file changed, 2 deletions(-) - ---- a/include/linux/device.h -+++ b/include/linux/device.h -@@ -25,8 +25,6 @@ - #include <asm/atomic.h> - #include <asm/device.h> - --#define BUS_ID_SIZE 20 -- - struct device; - struct device_private; - struct device_driver; diff --git a/driver-core.current/driver-model-fix-show-store-prototypes-in-doc.patch b/driver-core.current/driver-model-fix-show-store-prototypes-in-doc.patch deleted file mode 100644 index 58e7af14be045a..00000000000000 --- a/driver-core.current/driver-model-fix-show-store-prototypes-in-doc.patch +++ /dev/null @@ -1,33 +0,0 @@ -From rdunlap@xenotime.net Fri Jul 10 10:30:14 2009 -From: vibi sreenivasan <vibi_sreenivasan@cms.com> -Date: Wed, 8 Jul 2009 15:37:03 -0700 -Subject: driver model: fix show/store prototypes in doc. -Cc: gregkh <greg@kroah.com>, vibi sreenivasan <vibi_sreenivasan@cms.com> -Message-ID: <20090708153703.01fef7e0.rdunlap@xenotime.net> - - -From: vibi sreenivasan <vibi_sreenivasan@cms.com> - -FIX prototypes for show & store method in struct driver_attribute - -Signed-off-by: vibi sreenivasan <vibi_sreenivasan@cms.com> -Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - ---- - Documentation/driver-model/driver.txt | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - ---- a/Documentation/driver-model/driver.txt -+++ b/Documentation/driver-model/driver.txt -@@ -207,8 +207,8 @@ Attributes - ~~~~~~~~~~ - struct driver_attribute { - struct attribute attr; -- ssize_t (*show)(struct device_driver *, char * buf, size_t count, loff_t off); -- ssize_t (*store)(struct device_driver *, const char * buf, size_t count, loff_t off); -+ ssize_t (*show)(struct device_driver *driver, char *buf); -+ ssize_t (*store)(struct device_driver *, const char * buf, size_t count); - }; - - Device drivers can export attributes via their sysfs directories. diff --git a/driver-core.current/firmware-firmware_class-fix-lock-imbalance.patch b/driver-core.current/firmware-firmware_class-fix-lock-imbalance.patch deleted file mode 100644 index 59b6fe6b3a4598..00000000000000 --- a/driver-core.current/firmware-firmware_class-fix-lock-imbalance.patch +++ /dev/null @@ -1,33 +0,0 @@ -From jirislaby@gmail.com Thu Jul 2 15:12:34 2009 -From: Jiri Slaby <jirislaby@gmail.com> -Date: Sun, 21 Jun 2009 23:57:31 +0200 -Subject: Firmware: firmware_class, fix lock imbalance -To: gregkh@suse.de -Cc: linux-kernel@vger.kernel.org, Jiri Slaby <jirislaby@gmail.com> -Message-ID: <1245621451-26814-1-git-send-email-jirislaby@gmail.com> - - -Add omitted unlock in firmware_data_read. - -Signed-off-by: Jiri Slaby <jirislaby@gmail.com> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - ---- - drivers/base/firmware_class.c | 6 ++++-- - 1 file changed, 4 insertions(+), 2 deletions(-) - ---- a/drivers/base/firmware_class.c -+++ b/drivers/base/firmware_class.c -@@ -217,8 +217,10 @@ firmware_data_read(struct kobject *kobj, - 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/driver-core.current/omap-video-remove-direct-access-of-driver_data.patch b/driver-core.current/omap-video-remove-direct-access-of-driver_data.patch deleted file mode 100644 index 5567e9ac464210..00000000000000 --- a/driver-core.current/omap-video-remove-direct-access-of-driver_data.patch +++ /dev/null @@ -1,86 +0,0 @@ -From foo@baz Tue Jun 23 08:31:46 PDT 2009 -Date: Tue, 23 Jun 2009 08:31:46 -0700 -To: Greg KH <greg@kroah.com> -From: Greg Kroah-Hartman <gregkh@suse.de> -Subject: omap: video: remove direct access of driver_data - -dev_set/get_drvdata() should be used instead, as driver_data is going -away. - - -Cc: Imre Deak <imre.deak@nokia.com> -Cc: Russell King <rmk+kernel@arm.linux.org.uk> -Cc: Andrew Morton <akpm@linux-foundation.org> -Acked-by: Trilok Soni <soni.trilok@gmail.com> -Cc: Tony Lindgren <tony@atomide.com> -Cc: Felipe Contreras <felipe.contreras@nokia.com> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> ---- - drivers/video/omap/omapfb_main.c | 14 +++++++------- - 1 file changed, 7 insertions(+), 7 deletions(-) - ---- 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(stru - 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, omap - 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_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_leve - 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_leve - 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 - 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); - } diff --git a/driver-core.current/partitions-fix-broken-uevent_suppress-conversion.patch b/driver-core.current/partitions-fix-broken-uevent_suppress-conversion.patch deleted file mode 100644 index 28a00ce5b28245..00000000000000 --- a/driver-core.current/partitions-fix-broken-uevent_suppress-conversion.patch +++ /dev/null @@ -1,45 +0,0 @@ -From heiko.carstens@de.ibm.com Tue Jun 23 14:55:01 2009 -From: Heiko Carstens <heiko.carstens@de.ibm.com> -Date: Thu, 11 Jun 2009 15:14:40 +0200 -Subject: partitions: fix broken uevent_suppress conversion -To: Greg KH <gregkh@suse.de>, Andrew Morton <akpm@linux-foundation.org> -Cc: Ming Lei <tom.leiming@gmail.com> -Message-ID: <20090611131440.GA3146@osiris.boeblingen.de.ibm.com> -Content-Disposition: inline - - -From: Heiko Carstens <heiko.carstens@de.ibm.com> - -git commit f67f129e "Driver core: implement uevent suppress in kobject" -contains this chunk for fs/partitions/check.c: - - /* suppress uevent if the disk supresses it */ -- if (!ddev->uevent_suppress) -+ if (!dev_get_uevent_suppress(pdev)) - kobject_uevent(&pdev->kobj, KOBJ_ADD); - -However that should have been - -- if (!ddev->uevent_suppress) -+ if (!dev_get_uevent_suppress(ddev)) - -Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com> -Acked-by: Ming Lei <tom.leiming@gmail.com> -Cc: stable <stable@kernel.org> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - ---- - fs/partitions/check.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/fs/partitions/check.c -+++ b/fs/partitions/check.c -@@ -436,7 +436,7 @@ struct hd_struct *add_partition(struct g - rcu_assign_pointer(ptbl->part[partno], p); - - /* suppress uevent if the disk supresses it */ -- if (!dev_get_uevent_suppress(pdev)) -+ if (!dev_get_uevent_suppress(ddev)) - kobject_uevent(&pdev->kobj, KOBJ_ADD); - - return p; diff --git a/driver-core.current/sound-remove-direct-access-of-driver_data.patch b/driver-core.current/sound-remove-direct-access-of-driver_data.patch deleted file mode 100644 index a6beb5046284c1..00000000000000 --- a/driver-core.current/sound-remove-direct-access-of-driver_data.patch +++ /dev/null @@ -1,38 +0,0 @@ -From foo@baz Mon Jun 22 15:46:03 PDT 2009 -Date: Mon, 22 Jun 2009 15:46:03 -0700 -To: Greg KH <greg@kroah.com> -From: Greg Kroah-Hartman <gregkh@suse.de> -Subject: Sound: remove direct access of driver_data - -This is the last in-kernel direct usage of driver_data, replace it with -the proper dev_get/set_drvdata() calls. - -Cc: Takashi Iwai <tiwai@suse.de> -Cc: Jaroslav Kysela <perex@perex.cz> -Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com> -Cc: Liam Girdwood <lrg@slimlogic.co.uk> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - ---- - sound/soc/codecs/wm8988.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - ---- a/sound/soc/codecs/wm8988.c -+++ b/sound/soc/codecs/wm8988.c -@@ -1037,14 +1037,14 @@ static int __devinit wm8988_spi_probe(st - codec->control_data = spi; - codec->dev = &spi->dev; - -- spi->dev.driver_data = wm8988; -+ dev_set_drvdata(&spi->dev, wm8988); - - return wm8988_register(wm8988); - } - - static int __devexit wm8988_spi_remove(struct spi_device *spi) - { -- struct wm8988_priv *wm8988 = spi->dev.driver_data; -+ struct wm8988_priv *wm8988 = dev_get_drvdata(&spi->dev); - - wm8988_unregister(wm8988); - diff --git a/driver-core.current/sparc-remove-driver-core-bus_id_size.patch b/driver-core.current/sparc-remove-driver-core-bus_id_size.patch deleted file mode 100644 index 1fb276a8ca398b..00000000000000 --- a/driver-core.current/sparc-remove-driver-core-bus_id_size.patch +++ /dev/null @@ -1,37 +0,0 @@ -From kay.sievers@vrfy.org Thu Jul 2 14:44:18 2009 -From: Kay Sievers <kay.sievers@vrfy.org> -Date: Thu, 02 Jul 2009 23:27:22 +0200 -Subject: sparc: remove driver-core BUS_ID_SIZE -To: Greg KH <greg@kroah.com> -Message-ID: <1246570042.1896.4.camel@yio.site> - - -From: Kay Sievers <kay.sievers@vrfy.org> - -The name size limit is gone from the driver-core, the BUS_ID_SIZE -value will be removed. - -Cc: David S. Miller <davem@davemloft.net> -Signed-off-by: Kay Sievers <kay.sievers@vrfy.org> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - ---- - arch/sparc/kernel/vio.c | 7 ++++++- - 1 file changed, 6 insertions(+), 1 deletion(-) - ---- a/arch/sparc/kernel/vio.c -+++ b/arch/sparc/kernel/vio.c -@@ -224,7 +224,12 @@ static struct vio_dev *vio_create_one(st - if (!strcmp(type, "domain-services-port")) - bus_id_name = "ds"; - -- if (strlen(bus_id_name) >= BUS_ID_SIZE - 4) { -+ /* -+ * 20 char is the old driver-core name size limit, which is no more. -+ * This check can probably be removed after review and possible -+ * adaption of the vio users name length handling. -+ */ -+ if (strlen(bus_id_name) >= 20 - 4) { - printk(KERN_ERR "VIO: bus_id_name [%s] is too long.\n", - bus_id_name); - return NULL; diff --git a/driver-core.current/wm97xx_batery-replace-driver_data-with-dev_get_drvdata.patch b/driver-core.current/wm97xx_batery-replace-driver_data-with-dev_get_drvdata.patch deleted file mode 100644 index d7844cf0f8a3e2..00000000000000 --- a/driver-core.current/wm97xx_batery-replace-driver_data-with-dev_get_drvdata.patch +++ /dev/null @@ -1,37 +0,0 @@ -From a.beregalov@gmail.com Tue Jun 23 08:34:41 2009 -From: Alexander Beregalov <a.beregalov@gmail.com> -Date: Tue, 23 Jun 2009 17:50:06 +0400 -Subject: wm97xx_batery: replace driver_data with dev_get_drvdata() -To: <rmk+kernel@arm.linux.org.uk> -Cc: gregkh@suse.de, Alexander Beregalov <a.beregalov@gmail.com> -Message-ID: <1245765006-10863-1-git-send-email-a.beregalov@gmail.com> - - -direct access of driver_data is going away. - -Signed-off-by: Alexander Beregalov <a.beregalov@gmail.com> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - ---- - drivers/power/wm97xx_battery.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - ---- 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; - } @@ -9,17 +9,7 @@ gregkh/gkh-version.patch ################################# # Driver core patches for 2.6.31 ################################# -driver-core.current/devres-warn-and-return-don-t-crash-on-device_del-of-uninitialized-device.patch -driver-core.current/partitions-fix-broken-uevent_suppress-conversion.patch -driver-core.current/sparc-remove-driver-core-bus_id_size.patch -driver-core.current/driver-core-remove-bus_id_size.patch -driver-core.current/firmware-firmware_class-fix-lock-imbalance.patch -driver-core.current/driver-model-fix-show-store-prototypes-in-doc.patch - # driver_data cleanups -driver-core.current/sound-remove-direct-access-of-driver_data.patch -driver-core.current/omap-video-remove-direct-access-of-driver_data.patch -driver-core.current/wm97xx_batery-replace-driver_data-with-dev_get_drvdata.patch driver-core.current/driver-core-move-dev_get-set_drvdata-to-drivers-base-dd.c.patch ################################# @@ -1 +1 @@ -2.6.31-rc2 +2.6.31-rc2-git9 |