* [GIT PATCH] USB fixes for 2.6.30-rc4
@ 2009-05-09 3:24 Greg KH
2009-05-09 3:25 ` [PATCH 1/5] Driver core: platform: fix kernel-doc warnings Greg Kroah-Hartman
` (4 more replies)
0 siblings, 5 replies; 6+ messages in thread
From: Greg KH @ 2009-05-09 3:24 UTC (permalink / raw)
To: Linus Torvalds, Andrew Morton; +Cc: linux-kernel, linux-usb
Here's some USB fixes for your 2.6.30-rc4 tree.
More device ids, and some bugfixes for problems that people have
reported recently.
Please pull from:
master.kernel.org:/pub/scm/linux/kernel/git/gregkh/usb-2.6.git/
All of these patches have been in the -next and -mm releases for a while.
The full patches will be sent to the linux-usb mailing list, if anyone
wants to see them.
thanks,
greg k-h
------------
drivers/usb/Makefile | 2 ++
drivers/usb/atm/cxacru.c | 10 ++++++++--
drivers/usb/gadget/usbstring.c | 6 +++---
drivers/usb/serial/ftdi_sio.c | 20 ++++++++++++++++----
drivers/usb/serial/ftdi_sio.h | 6 ++++++
drivers/usb/storage/unusual_devs.h | 5 +++--
6 files changed, 38 insertions(+), 11 deletions(-)
---------------
Alan Stern (2):
USB: Gadget: fix UTF conversion in the usbstring library
usb-serial: ftdi_sio: fix reference counting of ftdi_private
Andy Lutomirski (1):
USB: Fix makefile so that CONFIG_WDM and CONFIG_TMC work.
Nicolas Pitre (1):
USB: ftdi_sio: add vendor/product id for the Marvell SheevaPlug
Phil Dibowitz (1):
USB: unusual_devs: extend nokia 6288 bcd range
Simon Arlott (1):
USB: cxacru: Fix negative dB output
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH 1/5] Driver core: platform: fix kernel-doc warnings
2009-05-09 3:24 [GIT PATCH] USB fixes for 2.6.30-rc4 Greg KH
@ 2009-05-09 3:25 ` Greg Kroah-Hartman
2009-05-09 3:25 ` [PATCH 2/5] Doc/sysfs-rules: Swap the order of the words so the sentence makes more sense Greg Kroah-Hartman
` (3 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: Greg Kroah-Hartman @ 2009-05-09 3:25 UTC (permalink / raw)
To: linux-kernel; +Cc: Randy Dunlap, Greg Kroah-Hartman
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 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/base/platform.c b/drivers/base/platform.c
index b5b6c97..ec5400c 100644
--- a/drivers/base/platform.c
+++ b/drivers/base/platform.c
@@ -1028,7 +1028,7 @@ static __initdata LIST_HEAD(early_platform_device_list);
/**
* 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_register_all(char *class_str)
/**
* 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_platform_driver *epdrv, int id)
/**
* 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,
--
1.6.3
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 2/5] Doc/sysfs-rules: Swap the order of the words so the sentence makes more sense
2009-05-09 3:24 [GIT PATCH] USB fixes for 2.6.30-rc4 Greg KH
2009-05-09 3:25 ` [PATCH 1/5] Driver core: platform: fix kernel-doc warnings Greg Kroah-Hartman
@ 2009-05-09 3:25 ` Greg Kroah-Hartman
2009-05-09 3:25 ` [PATCH 3/5] Remove old PRINTK_DEBUG config item Greg Kroah-Hartman
` (2 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: Greg Kroah-Hartman @ 2009-05-09 3:25 UTC (permalink / raw)
To: linux-kernel; +Cc: Henrik Austad, Randy Dunlap, Greg Kroah-Hartman
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 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/Documentation/sysfs-rules.txt b/Documentation/sysfs-rules.txt
index 6049a2a..5d8bc2c 100644
--- 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.
--
1.6.3
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 3/5] Remove old PRINTK_DEBUG config item
2009-05-09 3:24 [GIT PATCH] USB fixes for 2.6.30-rc4 Greg KH
2009-05-09 3:25 ` [PATCH 1/5] Driver core: platform: fix kernel-doc warnings Greg Kroah-Hartman
2009-05-09 3:25 ` [PATCH 2/5] Doc/sysfs-rules: Swap the order of the words so the sentence makes more sense Greg Kroah-Hartman
@ 2009-05-09 3:25 ` Greg Kroah-Hartman
2009-05-09 3:25 ` [PATCH 4/5] Revert driver core: fix passing platform_data Greg Kroah-Hartman
2009-05-09 3:25 ` [PATCH 5/5] Revert driver core: move platform_data into platform_device Greg Kroah-Hartman
4 siblings, 0 replies; 6+ messages in thread
From: Greg Kroah-Hartman @ 2009-05-09 3:25 UTC (permalink / raw)
To: linux-kernel; +Cc: Jason Baron, Greg Kroah-Hartman
From: Jason Baron <jbaron@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 files changed, 0 insertions(+), 1 deletions(-)
diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug
index 812c282..6cdcf38 100644
--- 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
--
1.6.3
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 4/5] Revert driver core: fix passing platform_data
2009-05-09 3:24 [GIT PATCH] USB fixes for 2.6.30-rc4 Greg KH
` (2 preceding siblings ...)
2009-05-09 3:25 ` [PATCH 3/5] Remove old PRINTK_DEBUG config item Greg Kroah-Hartman
@ 2009-05-09 3:25 ` Greg Kroah-Hartman
2009-05-09 3:25 ` [PATCH 5/5] Revert driver core: move platform_data into platform_device Greg Kroah-Hartman
4 siblings, 0 replies; 6+ messages in thread
From: Greg Kroah-Hartman @ 2009-05-09 3:25 UTC (permalink / raw)
To: linux-kernel; +Cc: Ming Lei, David Brownell, Greg Kroah-Hartman
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 files changed, 1 insertions(+), 14 deletions(-)
diff --git a/drivers/base/platform.c b/drivers/base/platform.c
index ec5400c..d1d0ee4 100644
--- a/drivers/base/platform.c
+++ b/drivers/base/platform.c
@@ -247,20 +247,7 @@ int platform_device_add(struct platform_device *pdev)
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];
--
1.6.3
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 5/5] Revert driver core: move platform_data into platform_device
2009-05-09 3:24 [GIT PATCH] USB fixes for 2.6.30-rc4 Greg KH
` (3 preceding siblings ...)
2009-05-09 3:25 ` [PATCH 4/5] Revert driver core: fix passing platform_data Greg Kroah-Hartman
@ 2009-05-09 3:25 ` Greg Kroah-Hartman
4 siblings, 0 replies; 6+ messages in thread
From: Greg Kroah-Hartman @ 2009-05-09 3:25 UTC (permalink / raw)
To: linux-kernel; +Cc: Greg Kroah-Hartman, David Brownell, Ming Lei
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(-)
diff --git a/drivers/base/platform.c b/drivers/base/platform.c
index d1d0ee4..8b4708e 100644
--- a/drivers/base/platform.c
+++ b/drivers/base/platform.c
@@ -217,7 +217,6 @@ int platform_device_add_data(struct platform_device *pdev, const void *data,
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_device *pdev)
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];
diff --git a/include/linux/device.h b/include/linux/device.h
index 6a69caa..5d5c197 100644
--- 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
diff --git a/include/linux/platform_device.h b/include/linux/platform_device.h
index 72736fd..b67bb5d 100644
--- 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;
};
--
1.6.3
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2009-05-09 3:31 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2009-05-09 3:24 [GIT PATCH] USB fixes for 2.6.30-rc4 Greg KH
2009-05-09 3:25 ` [PATCH 1/5] Driver core: platform: fix kernel-doc warnings Greg Kroah-Hartman
2009-05-09 3:25 ` [PATCH 2/5] Doc/sysfs-rules: Swap the order of the words so the sentence makes more sense Greg Kroah-Hartman
2009-05-09 3:25 ` [PATCH 3/5] Remove old PRINTK_DEBUG config item Greg Kroah-Hartman
2009-05-09 3:25 ` [PATCH 4/5] Revert driver core: fix passing platform_data Greg Kroah-Hartman
2009-05-09 3:25 ` [PATCH 5/5] Revert driver core: move platform_data into platform_device Greg Kroah-Hartman
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.