driver core: Silent meaningless error message
PATCH 1/1 driver core: Silent meaningless error message
I see the following error message in my kernel logs:
w83627ehf.2576: use which platform_data?
This is caused by platform_device_add_data() setting both pdev->platform_data and pdev->dev.platform_data, and then platform_device_add() complaining if both pointers are set.
As platform_device_add() is now making sure that both pointers are set, there is no point in setting both in platform_device_add_data().
Additionally, we should only issue the error message when there is a real problem, that is: both data pointers are set and differ. And, in this case, we should fail right away, as something is seriously wrong.
Also free the memory through pa->pdev.platform_data rather than pa->pdev.dev.platform_data. We will have to do that someday anyway, so we might as well start now to make the intents clearer.
--- drivers/base/platform.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
drivers/base/platform.c +5 -3
@@ -143,7 +143,7 @@ static void platform_device_release(stru struct platform_object *pa = container_of(dev, struct platform_object, pdev.dev); -kfree (pa->pdev.dev.platform_data); +kfree (pa->pdev.platform_data);kfree (pa->pdev.resource);kfree (pa); }
@@ -216,7 +216,6 @@ int platform_device_add_data(struct plat d =kmalloc (size,GFP_KERNEL );if (d) {memcpy (d, data, size); - pdev->dev.platform_data = d; pdev->platform_data = d; }return d ?0 : -ENOMEM ;
@@ -253,9 +252,12 @@ int platform_device_add(struct platform_* 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 +if (pdev->platform_data != pdev->dev.platform_data) { +printk (KERN_ERR "%s: use which platform_data?\n" ,dev_name (&pdev->dev)); +return -EINVAL ; + } }else if (pdev->platform_data) { pdev->dev.platform_data = pdev->platform_data; }else if (pdev->dev.platform_data) {
Signature · 1 line
Jean Delvare
Quoted 8 lines · Jean Delvare
I see the following error message in my kernel logs:
w83627ehf.2576: use which
platform_data?This is caused by
platform_device_add_data()setting bothpdev->platform_dataandpdev->dev.platform_data, and thenplatform_device_add()complaining if both pointers are set.
The patch that causes this is about to be reverted later today (it's already reverted in my trees), as it was the wrong thing to do, as you point out.
So this should be solved soon, no need for your patch.
thanks,
greg k-h
Hi Greg,
Quoted 10 lines · Greg KH
Quoted 8 lines · Jean Delvare
I see the following error message in my kernel logs:
w83627ehf.2576: use which
platform_data?This is caused by
platform_device_add_data()setting bothpdev->platform_dataandpdev->dev.platform_data, and thenplatform_device_add()complaining if both pointers are set.
Quoted 5 lines
The patch that causes this is about to be reverted later today (it's already reverted in my trees), as it was the wrong thing to do, as you point out.
So this should be solved soon, no need for your patch.
Any news on this? I can't see any fix in kernel 2.6.30-rc5.
Signature · 1 line
Jean Delvare
Quoted 13 lines · Jean Delvare
Hi Greg,
Quoted 10 lines · Greg KH
Quoted 8 lines · Jean Delvare
I see the following error message in my kernel logs:
w83627ehf.2576: use which
platform_data?This is caused by
platform_device_add_data()setting bothpdev->platform_dataandpdev->dev.platform_data, and thenplatform_device_add()complaining if both pointers are set.
Quoted 7 lines
Quoted 5 lines
The patch that causes this is about to be reverted later today (it's already reverted in my trees), as it was the wrong thing to do, as you point out.
So this should be solved soon, no need for your patch.
Any news on this? I can't see any fix in kernel 2.6.30-rc5.
It was sent to Linus about 8 hours ago, right after 2.6.30-rc5 came out. See the patches on lkml if you are interested.
thanks,
greg k-h