diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2009-05-11 13:13:59 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-05-11 13:13:59 -0700 |
| commit | 7f5bf6ed92b3be540478d7110d4f02affd272d70 (patch) | |
| tree | 91bd1c6a4fd99bcc7fb57bf53670fe2829174c91 | |
| parent | 235755243ee95ec163cfdf88618b5ed9f891b16c (diff) | |
| download | patches-7f5bf6ed92b3be540478d7110d4f02affd272d70.tar.gz | |
2.6.30-rc5-git1 resync and removal of patches now in Linus's tree
18 files changed, 13 insertions, 827 deletions
diff --git a/driver-core.current/doc-sysfs-rules-swap-the-order-of-the-words-so-the-sentence-makes-more-sense.patch b/driver-core.current/doc-sysfs-rules-swap-the-order-of-the-words-so-the-sentence-makes-more-sense.patch deleted file mode 100644 index c74cbc3f3c6720..00000000000000 --- a/driver-core.current/doc-sysfs-rules-swap-the-order-of-the-words-so-the-sentence-makes-more-sense.patch +++ /dev/null @@ -1,30 +0,0 @@ -From randy.dunlap@oracle.com Tue Apr 21 22:37:36 2009 -From: Henrik Austad <henrik@austad.us> -Date: Mon, 20 Apr 2009 18:42:38 -0700 -Subject: Doc/sysfs-rules: Swap the order of the words so the sentence makes more sense -Cc: gregkh@suse.de, Henrik Austad <henrik@austad.us> -Message-ID: <20090420184238.51cd7092.randy.dunlap@oracle.com> - - -From: Henrik Austad <henrik@austad.us> - -Signed-off-by: Henrik Austad <henrik@austad.us> -Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com> -Cc: Greg Kroah-Hartman <gregkh@suse.de> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - ---- - Documentation/sysfs-rules.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/Documentation/sysfs-rules.txt -+++ b/Documentation/sysfs-rules.txt -@@ -113,7 +113,7 @@ versions of the sysfs interface. - "devices" directory at /sys/subsystem/<name>/devices. - - If /sys/subsystem exists, /sys/bus, /sys/class and /sys/block can be -- ignored. If it does not exist, you have always to scan all three -+ ignored. If it does not exist, you always have to scan all three - places, as the kernel is free to move a subsystem from one place to - the other, as long as the devices are still reachable by the same - subsystem name. diff --git a/driver-core.current/driver-core-platform-fix-kernel-doc-warnings.patch b/driver-core.current/driver-core-platform-fix-kernel-doc-warnings.patch deleted file mode 100644 index 1849dfb5e11f5a..00000000000000 --- a/driver-core.current/driver-core-platform-fix-kernel-doc-warnings.patch +++ /dev/null @@ -1,49 +0,0 @@ -From rdunlap@xenotime.net Tue Apr 21 22:37:06 2009 -From: Randy Dunlap <rdunlap@xenotime.net> -Date: Tue, 21 Apr 2009 07:22:53 -0700 -Subject: Driver core: platform: fix kernel-doc warnings -To: Greg KH <gregkh@suse.de> -Message-ID: <49EDD6BD.1010006@xenotime.net> - - -From: Randy Dunlap <randy.dunlap@oracle.com> - -Fix function parameter notation in platform.c; -fixes kernel-doc warnings. - -Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - ---- - drivers/base/platform.c | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - ---- a/drivers/base/platform.c -+++ b/drivers/base/platform.c -@@ -1028,7 +1028,7 @@ static __initdata LIST_HEAD(early_platfo - - /** - * early_platform_driver_register -- * @edrv: early_platform driver structure -+ * @epdrv: early_platform driver structure - * @buf: string passed from early_param() - */ - int __init early_platform_driver_register(struct early_platform_driver *epdrv, -@@ -1112,7 +1112,7 @@ void __init early_platform_driver_regist - - /** - * early_platform_match -- * @edrv: early platform driver structure -+ * @epdrv: early platform driver structure - * @id: id to match against - */ - static __init struct platform_device * -@@ -1130,7 +1130,7 @@ early_platform_match(struct early_platfo - - /** - * early_platform_left -- * @edrv: early platform driver structure -+ * @epdrv: early platform driver structure - * @id: return true if id or above exists - */ - static __init int early_platform_left(struct early_platform_driver *epdrv, diff --git a/driver-core.current/remove-old-printk_debug-config-item.patch b/driver-core.current/remove-old-printk_debug-config-item.patch deleted file mode 100644 index 8e5914a17cd5be..00000000000000 --- a/driver-core.current/remove-old-printk_debug-config-item.patch +++ /dev/null @@ -1,44 +0,0 @@ -From jbaron@redhat.com Wed Apr 22 13:31:05 2009 -From: Jason Baron <jbaron@redhat.com> -Date: Wed, 22 Apr 2009 15:49:31 -0400 -Subject: Remove old PRINTK_DEBUG config item -To: Stefan Richter <stefanr@s5r6.in-berlin.de>, greg@kroah.com -Cc: "Robert P. J. Day" <rpjday@crashcourse.ca> -Message-ID: <20090422194931.GA24863@redhat.com> - - -On Tue, Apr 21, 2009 at 01:55:53PM +0200, Stefan Richter wrote: -> Robert P. J. Day wrote: -> > lib/Kconfig.debug: select PRINTK_DEBUG -> > -> > should that perhaps refer to "DYNAMIC_PRINTK_DEBUG"? since there is -> > no such thing as a PRINTK_DEBUG Kconfig variable. -> -> Looks like a rudiment from an earlier version of Jason's "driver core: -> basic infrastructure for per-module dynamic debug messages", -> http://git.kernel.org/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commitdiff;h=346e15beb5343c2eb8216d820f2ed8f150822b08 -> Search an LKML archive for '+#ifdef CONFIG_PRINTK_DEBUG'. -> -> Jason, should it be deleted or replaced by something? - -We re-named 'DYNAMIC_PRINTK_DEBUG' to 'DYNAMIC_DEBUG' in 2.6.30.... -'PRINTK_DEBUG' as pointed out never existed. So, it appears to be -extraneous, and should be removed. thanks for pointing it out. - -Signed-off-by: Jason Baron <jbaron@redhat.com> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - ---- - lib/Kconfig.debug | 1 - - 1 file changed, 1 deletion(-) - ---- a/lib/Kconfig.debug -+++ b/lib/Kconfig.debug -@@ -891,7 +891,6 @@ config DYNAMIC_DEBUG - default n - depends on PRINTK - depends on DEBUG_FS -- select PRINTK_DEBUG - help - - Compiles debug level messages into the kernel, which would not diff --git a/driver-core.current/revert-driver-core-fix-passing-platform_data.patch b/driver-core.current/revert-driver-core-fix-passing-platform_data.patch deleted file mode 100644 index 86ec4caf15e007..00000000000000 --- a/driver-core.current/revert-driver-core-fix-passing-platform_data.patch +++ /dev/null @@ -1,53 +0,0 @@ -From ce21c7bcd796fc4f45d48781b7e85f493cc55ee5 Mon Sep 17 00:00:00 2001 -From: Greg Kroah-Hartman <gregkh@suse.de> -Date: Fri, 13 Mar 2009 23:06:59 +0800 -Subject: Revert driver core: fix passing platform_data - -From: Ming Lei <tom.leiming@gmail.com> - -This reverts commit ce21c7bcd796fc4f45d48781b7e85f493cc55ee5: - We will remove platform_data field from struct device until - all platform devices pass its specific data from platfom_device - and all platform drivers use platform specific data passed by - platform_device->platform_data. This kind of conversion will - need a long time, for thousands of files is affected. - - To make the conversion easily, we allow platform specific data - passed by struct device or struct platform_device and platform - driver may use it from struct device or struct platform_device. - -As we really don't want to do this at all. - - -Cc: David Brownell <david-b@pacbell.net> -Cc: Ming Lei <tom.leiming@gmail.com> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - ---- - drivers/base/platform.c | 15 +-------------- - 1 file changed, 1 insertion(+), 14 deletions(-) - ---- a/drivers/base/platform.c -+++ b/drivers/base/platform.c -@@ -247,20 +247,7 @@ int platform_device_add(struct platform_ - else - dev_set_name(&pdev->dev, pdev->name); - -- /* We will remove platform_data field from struct device -- * if all platform devices pass its platform specific data -- * from platform_device. The conversion is going to be a -- * long time, so we allow the two cases coexist to make -- * this kind of fix more easily*/ -- if (pdev->platform_data && pdev->dev.platform_data) { -- printk(KERN_ERR -- "%s: use which platform_data?\n", -- dev_name(&pdev->dev)); -- } else if (pdev->platform_data) { -- pdev->dev.platform_data = pdev->platform_data; -- } else if (pdev->dev.platform_data) { -- pdev->platform_data = pdev->dev.platform_data; -- } -+ pdev->platform_data = pdev->dev.platform_data; - - for (i = 0; i < pdev->num_resources; i++) { - struct resource *p, *r = &pdev->resource[i]; diff --git a/driver-core.current/revert-driver-core-move-platform_data-into-platform_device.patch b/driver-core.current/revert-driver-core-move-platform_data-into-platform_device.patch deleted file mode 100644 index 36181b020557d6..00000000000000 --- a/driver-core.current/revert-driver-core-move-platform_data-into-platform_device.patch +++ /dev/null @@ -1,87 +0,0 @@ -From 006f4571a15fae3a0575f2a0f9e9b63b3d1012f8 Mon Sep 17 00:00:00 2001 -From: Greg Kroah-Hartman <gregkh@suse.de> -Date: Sun, 8 Mar 2009 23:13:32 +0800 -Subject: Revert driver core: move platform_data into platform_device - - -This reverts commit 006f4571a15fae3a0575f2a0f9e9b63b3d1012f8: - - This patch moves platform_data from struct device into - struct platform_device, based on the two ideas: - - 1. Now all platform_driver is registered by platform_driver_register, - which makes probe()/release()/... of platform_driver passed parameter - of platform_device *, so platform driver can get platform_data from - platform_device; - - 2. Other kind of devices do not need to use platform_data, we can - decrease size of device if moving it to platform_device. - - Taking into consideration of thousands of files to be fixed and they - can't be finished in one night(maybe it will take a long time), so we - keep platform_data in device to allow two kind of cases coexist until - all platform devices pass its platfrom data from - platform_device->platform_data. - - All patches to do this kind of conversion are welcome. - -As we don't really want to do it, it was a bad idea. - -Cc: David Brownell <david-b@pacbell.net> -Cc: Ming Lei <tom.leiming@gmail.com> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - - ---- - drivers/base/platform.c | 3 --- - include/linux/device.h | 9 ++------- - include/linux/platform_device.h | 1 - - 3 files changed, 2 insertions(+), 11 deletions(-) - ---- a/drivers/base/platform.c -+++ b/drivers/base/platform.c -@@ -217,7 +217,6 @@ int platform_device_add_data(struct plat - if (d) { - memcpy(d, data, size); - pdev->dev.platform_data = d; -- pdev->platform_data = d; - } - return d ? 0 : -ENOMEM; - } -@@ -247,8 +246,6 @@ int platform_device_add(struct platform_ - else - dev_set_name(&pdev->dev, pdev->name); - -- pdev->platform_data = pdev->dev.platform_data; -- - for (i = 0; i < pdev->num_resources; i++) { - struct resource *p, *r = &pdev->resource[i]; - ---- a/include/linux/device.h -+++ b/include/linux/device.h -@@ -384,13 +384,8 @@ struct device { - struct device_driver *driver; /* which driver has allocated this - device */ - void *driver_data; /* data private to the driver */ -- -- void *platform_data; /* We will remove platform_data -- field if all platform devices -- pass its platform specific data -- from platform_device->platform_data, -- other kind of devices should not -- use platform_data. */ -+ void *platform_data; /* Platform specific data, device -+ core doesn't touch it */ - struct dev_pm_info power; - - #ifdef CONFIG_NUMA ---- a/include/linux/platform_device.h -+++ b/include/linux/platform_device.h -@@ -20,7 +20,6 @@ struct platform_device { - struct device dev; - u32 num_resources; - struct resource * resource; -- void *platform_data; - - struct platform_device_id *id_entry; - }; diff --git a/driver-core/wireless-remove-driver_data-direct-access-of-struct-device.patch b/driver-core/wireless-remove-driver_data-direct-access-of-struct-device.patch index 2dd8f755eb84a3..922e26568d76f8 100644 --- a/driver-core/wireless-remove-driver_data-direct-access-of-struct-device.patch +++ b/driver-core/wireless-remove-driver_data-direct-access-of-struct-device.patch @@ -281,7 +281,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> else --- a/drivers/net/wireless/iwlwifi/iwl3945-base.c +++ b/drivers/net/wireless/iwlwifi/iwl3945-base.c -@@ -4365,7 +4365,7 @@ static int iwl3945_mac_beacon_update(str +@@ -4364,7 +4364,7 @@ static int iwl3945_mac_beacon_update(str static ssize_t show_debug_level(struct device *d, struct device_attribute *attr, char *buf) { @@ -290,7 +290,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> return sprintf(buf, "0x%08X\n", priv->debug_level); } -@@ -4373,7 +4373,7 @@ static ssize_t store_debug_level(struct +@@ -4372,7 +4372,7 @@ static ssize_t store_debug_level(struct struct device_attribute *attr, const char *buf, size_t count) { @@ -299,7 +299,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> unsigned long val; int ret; -@@ -4394,7 +4394,7 @@ static DEVICE_ATTR(debug_level, S_IWUSR +@@ -4393,7 +4393,7 @@ static DEVICE_ATTR(debug_level, S_IWUSR static ssize_t show_temperature(struct device *d, struct device_attribute *attr, char *buf) { @@ -308,7 +308,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> if (!iwl_is_alive(priv)) return -EAGAIN; -@@ -4407,7 +4407,7 @@ static DEVICE_ATTR(temperature, S_IRUGO, +@@ -4406,7 +4406,7 @@ static DEVICE_ATTR(temperature, S_IRUGO, static ssize_t show_tx_power(struct device *d, struct device_attribute *attr, char *buf) { @@ -317,7 +317,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> return sprintf(buf, "%d\n", priv->tx_power_user_lmt); } -@@ -4415,7 +4415,7 @@ static ssize_t store_tx_power(struct dev +@@ -4414,7 +4414,7 @@ static ssize_t store_tx_power(struct dev struct device_attribute *attr, const char *buf, size_t count) { @@ -326,7 +326,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> char *p = (char *)buf; u32 val; -@@ -4433,7 +4433,7 @@ static DEVICE_ATTR(tx_power, S_IWUSR | S +@@ -4432,7 +4432,7 @@ static DEVICE_ATTR(tx_power, S_IWUSR | S static ssize_t show_flags(struct device *d, struct device_attribute *attr, char *buf) { @@ -335,7 +335,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> return sprintf(buf, "0x%04X\n", priv->active_rxon.flags); } -@@ -4442,7 +4442,7 @@ static ssize_t store_flags(struct device +@@ -4441,7 +4441,7 @@ static ssize_t store_flags(struct device struct device_attribute *attr, const char *buf, size_t count) { @@ -344,7 +344,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> u32 flags = simple_strtoul(buf, NULL, 0); mutex_lock(&priv->mutex); -@@ -4467,7 +4467,7 @@ static DEVICE_ATTR(flags, S_IWUSR | S_IR +@@ -4466,7 +4466,7 @@ static DEVICE_ATTR(flags, S_IWUSR | S_IR static ssize_t show_filter_flags(struct device *d, struct device_attribute *attr, char *buf) { @@ -353,7 +353,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> return sprintf(buf, "0x%04X\n", le32_to_cpu(priv->active_rxon.filter_flags)); -@@ -4477,7 +4477,7 @@ static ssize_t store_filter_flags(struct +@@ -4476,7 +4476,7 @@ static ssize_t store_filter_flags(struct struct device_attribute *attr, const char *buf, size_t count) { @@ -362,7 +362,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> u32 filter_flags = simple_strtoul(buf, NULL, 0); mutex_lock(&priv->mutex); -@@ -4762,7 +4762,7 @@ static DEVICE_ATTR(antenna, S_IWUSR | S_ +@@ -4761,7 +4761,7 @@ static DEVICE_ATTR(antenna, S_IWUSR | S_ static ssize_t show_status(struct device *d, struct device_attribute *attr, char *buf) { @@ -371,7 +371,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> if (!iwl_is_alive(priv)) return -EAGAIN; return sprintf(buf, "0x%08x\n", (int)priv->status); -@@ -4774,10 +4774,11 @@ static ssize_t dump_error_log(struct dev +@@ -4773,10 +4773,11 @@ static ssize_t dump_error_log(struct dev struct device_attribute *attr, const char *buf, size_t count) { @@ -384,7 +384,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> return strnlen(buf, count); } -@@ -4788,10 +4789,11 @@ static ssize_t dump_event_log(struct dev +@@ -4787,10 +4788,11 @@ static ssize_t dump_event_log(struct dev struct device_attribute *attr, const char *buf, size_t count) { @@ -9,23 +9,12 @@ gregkh/gkh-version.patch ################################# # Driver core patches for 2.6.30 ################################# -driver-core.current/driver-core-platform-fix-kernel-doc-warnings.patch -driver-core.current/doc-sysfs-rules-swap-the-order-of-the-words-so-the-sentence-makes-more-sense.patch -driver-core.current/remove-old-printk_debug-config-item.patch -driver-core.current/revert-driver-core-fix-passing-platform_data.patch -driver-core.current/revert-driver-core-move-platform_data-into-platform_device.patch ################################# # USB patches for 2.6.30 ################################# -usb.current/usb-cxacru-fix-negative-db-output.patch -usb.current/usb-ftdi_sio-add-vendor-product-id-for-the-marvell-sheevaplug.patch -usb.current/usb-fix-makefile-so-that-config_wdm-and-config_tmc-work.patch -usb.current/usb-gadget-fix-utf-conversion-in-the-usbstring-library.patch -usb.current/usb-unusual_devs-extend-nokia-6288-bcd-range.patch -usb.current/usb-serial-ftdi_sio-fix-reference-counting-of-ftdi_private.patch @@ -209,10 +198,6 @@ usb/usb-xhci-depends-on-pci.patch ################################# # for before .30 is done: -staging/staging-w35und-unregister-device-from-the-ieee80211-stack-upon-disconnect.patch -staging/staging-rt2870-new-device-id.patch -staging/staging-rtl8187se-fix-compilation-warnings-and-procfs-directory-leak.patch -staging/staging-comedi-david-doesn-t-want-to-get-comedi-patches.patch # for after .30: staging/staging-comedi-remove-ni_board-typedef.patch diff --git a/staging/staging-comedi-david-doesn-t-want-to-get-comedi-patches.patch b/staging/staging-comedi-david-doesn-t-want-to-get-comedi-patches.patch deleted file mode 100644 index 55c181ac169e49..00000000000000 --- a/staging/staging-comedi-david-doesn-t-want-to-get-comedi-patches.patch +++ /dev/null @@ -1,20 +0,0 @@ -From foo@baz Fri Apr 24 17:04:44 PDT 2009 -Date: Fri, 24 Apr 2009 17:04:44 -0700 -To: Greg KH <greg@kroah.com> -From: Greg Kroah-Hartman <gregkh@suse.de> -Subject: Staging: comedi: David doesn't want to get comedi patches - -He's long moved on from the project. - -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> ---- - drivers/staging/comedi/TODO | 1 - - 1 file changed, 1 deletion(-) - ---- a/drivers/staging/comedi/TODO -+++ b/drivers/staging/comedi/TODO -@@ -11,4 +11,3 @@ Please send patches to Greg Kroah-Hartma - copy: - Ian Abbott <abbotti@mev.co.uk> - Frank Mori Hess <fmhess@users.sourceforge.net> -- David Schleef <ds@schleef.org> diff --git a/staging/staging-rt2870-new-device-id.patch b/staging/staging-rt2870-new-device-id.patch deleted file mode 100644 index b09c8836f16968..00000000000000 --- a/staging/staging-rt2870-new-device-id.patch +++ /dev/null @@ -1,33 +0,0 @@ -From dwhayes@gmail.com Tue Apr 21 16:14:19 2009 -From: Dave Hayes <dwhayes@gmail.com> -Date: Sat, 18 Apr 2009 02:18:37 -0500 -Subject: Staging: rt2870: new device id -To: Greg KH <greg@kroah.com> -Message-ID: <1240039117.5916.1.camel@dave-hdtv> - - -Hey, I have an Edimax wireless USB adapter that uses the rt2870 chipset. -lsusb shows it as follows: - -Bus 001 Device 002: ID 7392:7717 - -When I added that ID to rt2870.h, the device came up and worked as -expected. - -From: Dave Hayes <dwhayes@gmail.com> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - ---- - drivers/staging/rt2870/rt2870.h | 1 + - 1 file changed, 1 insertion(+) - ---- a/drivers/staging/rt2870/rt2870.h -+++ b/drivers/staging/rt2870/rt2870.h -@@ -145,6 +145,7 @@ - {USB_DEVICE(0x0789,0x0162)}, /* Logitec */ \ - {USB_DEVICE(0x0789,0x0163)}, /* Logitec */ \ - {USB_DEVICE(0x0789,0x0164)}, /* Logitec */ \ -+ {USB_DEVICE(0x7392,0x7717)}, /* Edimax */ \ - { }/* Terminating entry */ \ - } - diff --git a/staging/staging-rtl8187se-fix-compilation-warnings-and-procfs-directory-leak.patch b/staging/staging-rtl8187se-fix-compilation-warnings-and-procfs-directory-leak.patch deleted file mode 100644 index 6c6f9dc6c12755..00000000000000 --- a/staging/staging-rtl8187se-fix-compilation-warnings-and-procfs-directory-leak.patch +++ /dev/null @@ -1,137 +0,0 @@ -From Larry.Finger@lwfinger.net Wed Apr 22 09:51:03 2009 -From: Larry Finger <Larry.Finger@lwfinger.net> -Date: Sat, 18 Apr 2009 21:09:08 -0500 -Subject: Staging: rtl8187se: Fix compilation warnings and procfs directory leak -To: greg@kroah.com -Cc: John W Linville <linville@tuxdriver.com>, bernhard@schiffner-limbach.de -Message-ID: <49ea87c4.jfXxKzrtSmTK5/lF%Larry.Finger@lwfinger.net> - - -Fix some warnings during compilation and correct a programming error -that was leaking a directory in /proc. - -Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net> -Tested-by: Bernhard Schiffner <bernhard@schiffner-limbach.de> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - ---- - drivers/staging/rtl8187se/r8180.h | 2 - - drivers/staging/rtl8187se/r8180_core.c | 46 +++++---------------------------- - 2 files changed, 9 insertions(+), 39 deletions(-) - ---- a/drivers/staging/rtl8187se/r8180_core.c -+++ b/drivers/staging/rtl8187se/r8180_core.c -@@ -640,11 +640,9 @@ void rtl8180_proc_init_one(struct net_de - { - struct proc_dir_entry *e; - struct r8180_priv *priv = (struct r8180_priv *)ieee80211_priv(dev); -- priv->dir_dev = create_proc_entry(dev->name, -- S_IFDIR | S_IRUGO | S_IXUGO, -- rtl8180_proc); -+ priv->dir_dev = rtl8180_proc; - if (!priv->dir_dev) { -- DMESGE("Unable to initialize /proc/net/rtl8180/%s\n", -+ DMESGE("Unable to initialize /proc/net/r8180/%s\n", - dev->name); - return; - } -@@ -654,7 +652,7 @@ void rtl8180_proc_init_one(struct net_de - - if (!e) { - DMESGE("Unable to initialize " -- "/proc/net/rtl8180/%s/stats-hw\n", -+ "/proc/net/r8180/%s/stats-hw\n", - dev->name); - } - -@@ -663,7 +661,7 @@ void rtl8180_proc_init_one(struct net_de - - if (!e) { - DMESGE("Unable to initialize " -- "/proc/net/rtl8180/%s/stats-rx\n", -+ "/proc/net/r8180/%s/stats-rx\n", - dev->name); - } - -@@ -673,7 +671,7 @@ void rtl8180_proc_init_one(struct net_de - - if (!e) { - DMESGE("Unable to initialize " -- "/proc/net/rtl8180/%s/stats-tx\n", -+ "/proc/net/r8180/%s/stats-tx\n", - dev->name); - } - #if 0 -@@ -702,7 +700,7 @@ void rtl8180_proc_init_one(struct net_de - - if (!e) { - DMESGE("Unable to initialize " -- "/proc/net/rtl8180/%s/registers\n", -+ "/proc/net/r8180/%s/registers\n", - dev->name); - } - } -@@ -977,13 +975,6 @@ void check_tx_ring(struct net_device *de - *tmp & (1<<15)? "ok": "err", *(tmp+4)); - } - -- DMESG("nic at %d", -- (nic-nicbegin) / 8 /4); -- DMESG("tail at %d", ((int)tail - (int)begin) /8 /4); -- DMESG("head at %d", ((int)head - (int)begin) /8 /4); -- DMESG("check free desc returns %d", check_nic_enought_desc(dev,pri)); -- DMESG("free desc is %d\n", get_curr_tx_free_desc(dev,pri)); -- //rtl8180_reset(dev); - return; - } - -@@ -1736,17 +1727,7 @@ short alloc_tx_desc_ring(struct net_devi - * descriptor's buffer must be 256 byte aligned - * we shouldn't be here, since we set DMA mask ! - */ -- DMESGW("Fixing TX alignment"); -- desc = (u32*)((u8*)desc + 256); --#if (defined(CONFIG_HIGHMEM64G) || defined(CONFIG_64BIT_PHYS_ADDR)) -- desc = (u32*)((u64)desc &~ 0xff); -- dma_desc = (dma_addr_t)((u8*)dma_desc + 256); -- dma_desc = (dma_addr_t)((u64)dma_desc &~ 0xff); --#else -- desc = (u32*)((u32)desc &~ 0xff); -- dma_desc = (dma_addr_t)((u8*)dma_desc + 256); -- dma_desc = (dma_addr_t)((u32)dma_desc &~ 0xff); --#endif -+ WARN(1, "DMA buffer is not aligned\n"); - } - tmp=desc; - for (i=0;i<count;i++) -@@ -1984,18 +1965,7 @@ short alloc_rx_desc_ring(struct net_devi - * descriptor's buffer must be 256 byte aligned - * should never happen since we specify the DMA mask - */ -- -- DMESGW("Fixing RX alignment"); -- desc = (u32*)((u8*)desc + 256); --#if (defined(CONFIG_HIGHMEM64G) || defined(CONFIG_64BIT_PHYS_ADDR)) -- desc = (u32*)((u64)desc &~ 0xff); -- dma_desc = (dma_addr_t)((u8*)dma_desc + 256); -- dma_desc = (dma_addr_t)((u64)dma_desc &~ 0xff); --#else -- desc = (u32*)((u32)desc &~ 0xff); -- dma_desc = (dma_addr_t)((u8*)dma_desc + 256); -- dma_desc = (dma_addr_t)((u32)dma_desc &~ 0xff); --#endif -+ WARN(1, "DMA buffer is not aligned\n"); - } - - priv->rxring=desc; ---- a/drivers/staging/rtl8187se/r8180.h -+++ b/drivers/staging/rtl8187se/r8180.h -@@ -19,7 +19,7 @@ - #define R8180H - - --#define RTL8180_MODULE_NAME "rtl8180" -+#define RTL8180_MODULE_NAME "r8180" - #define DMESG(x,a...) printk(KERN_INFO RTL8180_MODULE_NAME ": " x "\n", ## a) - #define DMESGW(x,a...) printk(KERN_WARNING RTL8180_MODULE_NAME ": WW:" x "\n", ## a) - #define DMESGE(x,a...) printk(KERN_WARNING RTL8180_MODULE_NAME ": EE:" x "\n", ## a) diff --git a/staging/staging-w35und-unregister-device-from-the-ieee80211-stack-upon-disconnect.patch b/staging/staging-w35und-unregister-device-from-the-ieee80211-stack-upon-disconnect.patch deleted file mode 100644 index db5416486b6203..00000000000000 --- a/staging/staging-w35und-unregister-device-from-the-ieee80211-stack-upon-disconnect.patch +++ /dev/null @@ -1,54 +0,0 @@ -From penberg@cs.helsinki.fi Tue Apr 21 15:19:59 2009 -From: Pekka Enberg <penberg@cs.helsinki.fi> -Date: Thu, 16 Apr 2009 14:43:14 +0300 -Subject: Staging: w35und: unregister device from the ieee80211 stack upon ->disconnect() -To: Greg KH <greg@kroah.com> -Cc: luoyi.ly@gmail.com, sandro.bonazzola@gmail.com, pavel@ucw.cz -Message-ID: <1239882194.28965.46.camel@penberg-laptop> - - -From: Pekka Enberg <penberg@cs.helsinki.fi> - -Impact: fix module removal - -This patch fixes an oops when the w35und module is removed from the -kernel and added back. - -Reported-by: luoyi <luoyi.ly@gmail.com> -Tested-by: Sandro Bonazzola <sandro.bonazzola@gmail.com> -Cc: Pavel Machek <pavel@ucw.cz> -Signed-off-by: Pekka Enberg <penberg@cs.helsinki.fi> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - ---- - drivers/staging/winbond/wbusb.c | 9 +++++++-- - 1 file changed, 7 insertions(+), 2 deletions(-) - ---- a/drivers/staging/winbond/wbusb.c -+++ b/drivers/staging/winbond/wbusb.c -@@ -386,7 +386,7 @@ static int wb35_probe(struct usb_interfa - if (err) - goto error_free_hw; - -- usb_set_intfdata(intf, priv); -+ usb_set_intfdata(intf, dev); - - return 0; - -@@ -415,10 +415,15 @@ static void wb35_hw_halt(struct wbsoft_p - - static void wb35_disconnect(struct usb_interface *intf) - { -- struct wbsoft_priv *priv = usb_get_intfdata(intf); -+ struct ieee80211_hw *hw = usb_get_intfdata(intf); -+ struct wbsoft_priv *priv = hw->priv; - - wb35_hw_halt(priv); - -+ ieee80211_stop_queues(hw); -+ ieee80211_unregister_hw(hw); -+ ieee80211_free_hw(hw); -+ - usb_set_intfdata(intf, NULL); - usb_put_dev(interface_to_usbdev(intf)); - } diff --git a/usb.current/usb-cxacru-fix-negative-db-output.patch b/usb.current/usb-cxacru-fix-negative-db-output.patch deleted file mode 100644 index ee1b81610c4aa8..00000000000000 --- a/usb.current/usb-cxacru-fix-negative-db-output.patch +++ /dev/null @@ -1,38 +0,0 @@ -From simon@fire.lp0.eu Fri Apr 24 15:38:05 2009 -From: Simon Arlott <simon@fire.lp0.eu> -Date: Thu, 23 Apr 2009 18:19:02 +0100 -Subject: USB: cxacru: Fix negative dB output -To: Greg Kroah-Hartman <gregkh@suse.de> -Message-ID: <49F0A306.9010409@simon.arlott.org.uk> - - -Values of dB between -0.99 and -0.01 will be output with the wrong -sign. This converts the negative value to positive and outputs it -with a "-" prefix. - -Signed-off-by: Simon Arlott <simon@fire.lp0.eu> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - ---- - drivers/usb/atm/cxacru.c | 10 ++++++++-- - 1 file changed, 8 insertions(+), 2 deletions(-) - ---- a/drivers/usb/atm/cxacru.c -+++ b/drivers/usb/atm/cxacru.c -@@ -227,8 +227,14 @@ static ssize_t cxacru_sysfs_showattr_s8( - - static ssize_t cxacru_sysfs_showattr_dB(s16 value, char *buf) - { -- return snprintf(buf, PAGE_SIZE, "%d.%02u\n", -- value / 100, abs(value) % 100); -+ if (likely(value >= 0)) { -+ return snprintf(buf, PAGE_SIZE, "%u.%02u\n", -+ value / 100, value % 100); -+ } else { -+ value = -value; -+ return snprintf(buf, PAGE_SIZE, "-%u.%02u\n", -+ value / 100, value % 100); -+ } - } - - static ssize_t cxacru_sysfs_showattr_bool(u32 value, char *buf) diff --git a/usb.current/usb-fix-makefile-so-that-config_wdm-and-config_tmc-work.patch b/usb.current/usb-fix-makefile-so-that-config_wdm-and-config_tmc-work.patch deleted file mode 100644 index 92340a17b3c6af..00000000000000 --- a/usb.current/usb-fix-makefile-so-that-config_wdm-and-config_tmc-work.patch +++ /dev/null @@ -1,31 +0,0 @@ -From amluto@gmail.com Tue Apr 28 15:45:16 2009 -From: Andrew Lutomirski <amluto@gmail.com> -Date: Tue, 28 Apr 2009 15:53:02 -0400 -Subject: USB: Fix makefile so that CONFIG_WDM and CONFIG_TMC work. -To: gregkh@suse.de -Message-ID: <cb0375e10904281253y67349baaq6588a3933720f89b@mail.gmail.com> - - -From: Andy Lutomirski <amluto@gmail.com> - -If CONFIG_USB_ACM and CONFIG_USB_PRINTER are not set, then -cdc-wdm and usbtmc won't get built. - -Signed-off-by: Andy Lutomirski <amluto@gmail.com> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - ---- - drivers/usb/Makefile | 2 ++ - 1 file changed, 2 insertions(+) - ---- a/drivers/usb/Makefile -+++ b/drivers/usb/Makefile -@@ -27,6 +27,8 @@ obj-$(CONFIG_USB_WUSB) += wusbcore/ - - obj-$(CONFIG_USB_ACM) += class/ - obj-$(CONFIG_USB_PRINTER) += class/ -+obj-$(CONFIG_USB_WDM) += class/ -+obj-$(CONFIG_USB_TMC) += class/ - - obj-$(CONFIG_USB_STORAGE) += storage/ - obj-$(CONFIG_USB) += storage/ diff --git a/usb.current/usb-ftdi_sio-add-vendor-product-id-for-the-marvell-sheevaplug.patch b/usb.current/usb-ftdi_sio-add-vendor-product-id-for-the-marvell-sheevaplug.patch deleted file mode 100644 index bd66d6da60be47..00000000000000 --- a/usb.current/usb-ftdi_sio-add-vendor-product-id-for-the-marvell-sheevaplug.patch +++ /dev/null @@ -1,46 +0,0 @@ -From nico@cam.org Fri Apr 24 15:38:47 2009 -From: Nicolas Pitre <nico@cam.org> -Date: Thu, 23 Apr 2009 22:38:12 -0400 (EDT) -Subject: USB: ftdi_sio: add vendor/product id for the Marvell SheevaPlug -To: Greg Kroah-Hartman <gregkh@suse.de> -Message-ID: <alpine.LFD.2.00.0904232234550.6741@xanadu.home> - - - -For reference: -http://www.marvell.com/products/embedded_processors/developer/kirkwood/sheevaplug.jsp - -Signed-off-by: Nicolas Pitre <nico@marvell.com> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - ---- - drivers/usb/serial/ftdi_sio.c | 2 ++ - drivers/usb/serial/ftdi_sio.h | 6 ++++++ - 2 files changed, 8 insertions(+) - ---- a/drivers/usb/serial/ftdi_sio.c -+++ b/drivers/usb/serial/ftdi_sio.c -@@ -669,6 +669,8 @@ static struct usb_device_id id_table_com - { USB_DEVICE(ADI_VID, ADI_GNICE_PID), - .driver_info = (kernel_ulong_t)&ftdi_jtag_quirk }, - { USB_DEVICE(JETI_VID, JETI_SPC1201_PID) }, -+ { USB_DEVICE(MARVELL_VID, MARVELL_SHEEVAPLUG_PID), -+ .driver_info = (kernel_ulong_t)&ftdi_jtag_quirk }, - { }, /* Optional parameter entry */ - { } /* Terminating entry */ - }; ---- a/drivers/usb/serial/ftdi_sio.h -+++ b/drivers/usb/serial/ftdi_sio.h -@@ -920,6 +920,12 @@ - #define JETI_SPC1201_PID 0x04b2 - - /* -+ * Marvell SheevaPlug -+ */ -+#define MARVELL_VID 0x9e88 -+#define MARVELL_SHEEVAPLUG_PID 0x9e8f -+ -+/* - * BmRequestType: 1100 0000b - * bRequest: FTDI_E2_READ - * wValue: 0 diff --git a/usb.current/usb-gadget-fix-utf-conversion-in-the-usbstring-library.patch b/usb.current/usb-gadget-fix-utf-conversion-in-the-usbstring-library.patch deleted file mode 100644 index 54fc6975e59df7..00000000000000 --- a/usb.current/usb-gadget-fix-utf-conversion-in-the-usbstring-library.patch +++ /dev/null @@ -1,50 +0,0 @@ -From stern@rowland.harvard.edu Tue Apr 28 15:49:13 2009 -From: Alan Stern <stern@rowland.harvard.edu> -Date: Mon, 27 Apr 2009 13:22:40 -0400 (EDT) -Subject: USB: Gadget: fix UTF conversion in the usbstring library -To: Greg KH <greg@kroah.com> -Cc: David Brownell <david-b@pacbell.net> -Message-ID: <Pine.LNX.4.44L0.0904271319510.10904-100000@iolanthe.rowland.org> - - -This patch (as1234) fixes a bug in the UTF8 -> UTF-16 conversion -routine in the gadget/usbstring library. In a UTF-8 multi-byte -sequence, all bytes after the first should have their high-order -two bits set to 10, not 11. - -Signed-off-by: Alan Stern <stern@rowland.harvard.edu> -Acked-by: David Brownell <dbrownell@users.sourceforge.net> -Cc: stable <stable@kernel.org> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - ---- - drivers/usb/gadget/usbstring.c | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - ---- a/drivers/usb/gadget/usbstring.c -+++ b/drivers/usb/gadget/usbstring.c -@@ -38,7 +38,7 @@ static int utf8_to_utf16le(const char *s - uchar = (c & 0x1f) << 6; - - c = (u8) *s++; -- if ((c & 0xc0) != 0xc0) -+ if ((c & 0xc0) != 0x80) - goto fail; - c &= 0x3f; - uchar |= c; -@@ -49,13 +49,13 @@ static int utf8_to_utf16le(const char *s - uchar = (c & 0x0f) << 12; - - c = (u8) *s++; -- if ((c & 0xc0) != 0xc0) -+ if ((c & 0xc0) != 0x80) - goto fail; - c &= 0x3f; - uchar |= c << 6; - - c = (u8) *s++; -- if ((c & 0xc0) != 0xc0) -+ if ((c & 0xc0) != 0x80) - goto fail; - c &= 0x3f; - uchar |= c; diff --git a/usb.current/usb-serial-ftdi_sio-fix-reference-counting-of-ftdi_private.patch b/usb.current/usb-serial-ftdi_sio-fix-reference-counting-of-ftdi_private.patch deleted file mode 100644 index fa6fe26c2f81e4..00000000000000 --- a/usb.current/usb-serial-ftdi_sio-fix-reference-counting-of-ftdi_private.patch +++ /dev/null @@ -1,93 +0,0 @@ -From stern@rowland.harvard.edu Fri May 1 13:48:35 2009 -From: Alan Stern <stern@rowland.harvard.edu> -Date: Thu, 30 Apr 2009 10:06:19 -0400 (EDT) -Subject: usb-serial: ftdi_sio: fix reference counting of ftdi_private -To: Greg KH <greg@kroah.com> -Cc: Andrew Morton <akpm@linux-foundation.org>, Daniel Mack <daniel@caiaq.de> -Message-ID: <Pine.LNX.4.44L0.0904300947340.16085-100000@netrider.rowland.org> - - -This patch (as1238) adds proper reference counting for ftdi_sio's -private data structure. Without it, the driver will free the -structure while it is still in use if the user unplugs the serial -device before closing the device file. - -The patch also replaces a slightly dangerous -cancel_delayed_work/flush_scheduled_work pair with -cancel_delayed_work_sync, which is always safer. - -Signed-off-by: Alan Stern <stern@rowland.harvard.edu> -Reported-by: Daniel Mack <daniel@caiaq.de> -Tested-by: Daniel Mack <daniel@caiaq.de> -Cc: stable <stable@kernel.org> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - ---- - drivers/usb/serial/ftdi_sio.c | 18 ++++++++++++++---- - 1 file changed, 14 insertions(+), 4 deletions(-) - ---- a/drivers/usb/serial/ftdi_sio.c -+++ b/drivers/usb/serial/ftdi_sio.c -@@ -56,6 +56,7 @@ static __u16 vendor = FTDI_VID; - static __u16 product; - - struct ftdi_private { -+ struct kref kref; - ftdi_chip_type_t chip_type; - /* type of device, either SIO or FT8U232AM */ - int baud_base; /* baud base clock for divisor setting */ -@@ -1354,6 +1355,7 @@ static int ftdi_sio_port_probe(struct us - return -ENOMEM; - } - -+ kref_init(&priv->kref); - spin_lock_init(&priv->rx_lock); - spin_lock_init(&priv->tx_lock); - init_waitqueue_head(&priv->delta_msr_wait); -@@ -1470,6 +1472,13 @@ static void ftdi_shutdown(struct usb_ser - dbg("%s", __func__); - } - -+static void ftdi_sio_priv_release(struct kref *k) -+{ -+ struct ftdi_private *priv = container_of(k, struct ftdi_private, kref); -+ -+ kfree(priv); -+} -+ - static int ftdi_sio_port_remove(struct usb_serial_port *port) - { - struct ftdi_private *priv = usb_get_serial_port_data(port); -@@ -1484,7 +1493,7 @@ static int ftdi_sio_port_remove(struct u - - if (priv) { - usb_set_serial_port_data(port, NULL); -- kfree(priv); -+ kref_put(&priv->kref, ftdi_sio_priv_release); - } - - return 0; -@@ -1549,7 +1558,8 @@ static int ftdi_open(struct tty_struct * - dev_err(&port->dev, - "%s - failed submitting read urb, error %d\n", - __func__, result); -- -+ else -+ kref_get(&priv->kref); - - return result; - } /* ftdi_open */ -@@ -1591,11 +1601,11 @@ static void ftdi_close(struct tty_struct - mutex_unlock(&port->serial->disc_mutex); - - /* cancel any scheduled reading */ -- cancel_delayed_work(&priv->rx_work); -- flush_scheduled_work(); -+ cancel_delayed_work_sync(&priv->rx_work); - - /* shutdown our bulk read */ - usb_kill_urb(port->read_urb); -+ kref_put(&priv->kref, ftdi_sio_priv_release); - } /* ftdi_close */ - - diff --git a/usb.current/usb-unusual_devs-extend-nokia-6288-bcd-range.patch b/usb.current/usb-unusual_devs-extend-nokia-6288-bcd-range.patch deleted file mode 100644 index 9402cc71710fca..00000000000000 --- a/usb.current/usb-unusual_devs-extend-nokia-6288-bcd-range.patch +++ /dev/null @@ -1,34 +0,0 @@ -From phil@ipom.com Tue Apr 28 15:56:49 2009 -From: Phil Dibowitz <phil@ipom.com> -Date: Sun, 26 Apr 2009 12:47:51 +0200 -Subject: USB: unusual_devs: extend nokia 6288 bcd range -To: Greg KH <greg@kroah.com> -Cc: Phillip Potter <phillipinda@hotmail.com> -Message-ID: <49F43BD7.8070709@ipom.com> - - -This patch was originaly submitted by Phillip Potter -<phillipinda@hotmail.com> but was re-diffed to conform with -SubmittingPatches and to rebase on a newer tree by me. - -Signed-off-by: Phil Dibowitz <phil@ipom.com> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - ---- - drivers/usb/storage/unusual_devs.h | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - ---- a/drivers/usb/storage/unusual_devs.h -+++ b/drivers/usb/storage/unusual_devs.h -@@ -160,8 +160,9 @@ UNUSUAL_DEV( 0x0420, 0x0001, 0x0100, 0x - US_SC_DEVICE, US_PR_DEVICE, NULL, - US_FL_IGNORE_RESIDUE ), - --/* Reported by Andrew Nayenko <relan@bk.ru> */ --UNUSUAL_DEV( 0x0421, 0x0019, 0x0592, 0x0592, -+/* Reported by Andrew Nayenko <relan@bk.ru> -+ * Updated for new firmware by Phillip Potter <phillipinda@hotmail.com> */ -+UNUSUAL_DEV( 0x0421, 0x0019, 0x0592, 0x0610, - "Nokia", - "Nokia 6288", - US_SC_DEVICE, US_PR_DEVICE, NULL, @@ -1 +1 @@ -2.6.30-rc5 +2.6.30-rc5-git1 |