Subject: [PATCH 1/3] mfd: always assign of_node in mfd_add_device()

From: [email-masked] (Lee Jones)
Date: Fri, 20 Dec 2013 14:25:30 +0000

Hi Stephen,

Please let me know if this is suitable and I can keep your Ack.

----

mfd: Revert "mfd: Always assign of_node in mfd_add_device()"

This reverts commit 68044bee13770918e0b28dd44aa98c889ec7558f.

We've had confirmed reports of this patch causing unforeseen issues
with existing MFD users. It has been agreed by the original author
and myself that reversion is the best solution.

Acked-by: Stephen Warren <[email-masked]>
Signed-off-by: Lee Jones <[email-masked]>

diff --git a/drivers/mfd/mfd-core.c b/drivers/mfd/mfd-core.c
index 32e8d47..2676492 100644
--- a/drivers/mfd/mfd-core.c
+++ b/drivers/mfd/mfd-core.c
@@ -117,8 +117,6 @@ static int mfd_add_device(struct device *parent, int id,
 			}
 		}
 	}
-	if (!pdev->dev.of_node)
-		pdev->dev.of_node = parent->of_node;
 
 	if (cell->pdata_size) {
 		ret = platform_device_add_data(pdev,

-- 
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org ? Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog