From e5de40b5f54252a07e8bb81788a8d530feb17b18 Mon Sep 17 00:00:00 2001 From: Ming Lei Date: Fri, 13 Mar 2009 23:06:59 +0800 Subject: [PATCH] --- yaml --- r: 144827 b: refs/heads/master c: bee86321b7b2312fbb62f4cb903eba1cca45e8ad h: refs/heads/master i: 144825: 39cd94980dcf38afa2e48a16a4da1c4c7c217f10 144823: 750311b2184e55ed438e56f3e74941871245bf5f v: v3 --- [refs] | 2 +- trunk/drivers/base/platform.c | 15 +-------------- 2 files changed, 2 insertions(+), 15 deletions(-) diff --git a/[refs] b/[refs] index 0b54aef7c3fe..2c7917634b57 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: fe0e2bb9b3ca55b78e637b1260faeaa951523959 +refs/heads/master: bee86321b7b2312fbb62f4cb903eba1cca45e8ad diff --git a/trunk/drivers/base/platform.c b/trunk/drivers/base/platform.c index ec5400c32021..d1d0ee431926 100644 --- a/trunk/drivers/base/platform.c +++ b/trunk/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];