From fa5bced397077753d2537a3d33da1bbefe8831e4 Mon Sep 17 00:00:00 2001 From: Pierre-Louis Bossart Date: Wed, 9 Dec 2020 18:37:19 -0600 Subject: [PATCH 1/2] Revert "device property: Don't clear secondary pointer for shared primary firmware node" This reverts commit 99aed9227073fb34ce2880cbc7063e04185a65e1. Signed-off-by: Pierre-Louis Bossart --- drivers/base/core.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/drivers/base/core.c b/drivers/base/core.c index d661ada1518fb4..3674cd86c367ec 100644 --- a/drivers/base/core.c +++ b/drivers/base/core.c @@ -4262,7 +4262,6 @@ static inline bool fwnode_is_primary(struct fwnode_handle *fwnode) */ void set_primary_fwnode(struct device *dev, struct fwnode_handle *fwnode) { - struct device *parent = dev->parent; struct fwnode_handle *fn = dev->fwnode; if (fwnode) { @@ -4277,8 +4276,7 @@ void set_primary_fwnode(struct device *dev, struct fwnode_handle *fwnode) } else { if (fwnode_is_primary(fn)) { dev->fwnode = fn->secondary; - if (!(parent && fn == parent->fwnode)) - fn->secondary = ERR_PTR(-ENODEV); + fn->secondary = ERR_PTR(-ENODEV); } else { dev->fwnode = NULL; } From 402e0589d5f1b316b90c948a959c9ec2ea748395 Mon Sep 17 00:00:00 2001 From: Pierre-Louis Bossart Date: Wed, 9 Dec 2020 18:37:38 -0600 Subject: [PATCH 2/2] Revert "device property: Keep secondary firmware node secondary by type" This reverts commit d5dcce0c414fcbfe4c2037b66ac69ea5f9b3f75c. Signed-off-by: Pierre-Louis Bossart --- drivers/base/core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/base/core.c b/drivers/base/core.c index 3674cd86c367ec..b756217af78480 100644 --- a/drivers/base/core.c +++ b/drivers/base/core.c @@ -4276,7 +4276,7 @@ void set_primary_fwnode(struct device *dev, struct fwnode_handle *fwnode) } else { if (fwnode_is_primary(fn)) { dev->fwnode = fn->secondary; - fn->secondary = ERR_PTR(-ENODEV); + fn->secondary = NULL; } else { dev->fwnode = NULL; }