[v3] base: core: Remove WARN_ON from link dependencies check

Message ID 20180716113744.13300-1-benjamin.gaignard@st.com
State Accepted
Commit e16f4f3e0b7daecd48d4f944ab4147c1a6cb16a8
Headers show
Series
  • [v3] base: core: Remove WARN_ON from link dependencies check
Related show

Commit Message

Benjamin Gaignard July 16, 2018, 11:37 a.m.
In some cases the link between between customer and supplier
already exist, for example when a device use its parent as a supplier.
Do not warn about already existing dependencies because device_link_add()
takes care of this case.

Link: http://lkml.kernel.org/r/20180709111753eucas1p1f32e66fb2f7ea3216097cd72a132355d~-rzycA5Rg0378203782eucas1p1C@eucas1p1.samsung.com

Reported-by: Marek Szyprowski <m.szyprowski@samsung.com>
Reviewed-by: Mark Brown <broonie@kernel.org>

Signed-off-by: Benjamin Gaignard <benjamin.gaignard@st.com>

---
 drivers/base/core.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

-- 
2.15.0

Comments

Rafael J. Wysocki July 17, 2018, 9:56 a.m. | #1
On Monday, July 16, 2018 1:37:44 PM CEST Benjamin Gaignard wrote:
> In some cases the link between between customer and supplier

> already exist, for example when a device use its parent as a supplier.

> Do not warn about already existing dependencies because device_link_add()

> takes care of this case.

> 

> Link: http://lkml.kernel.org/r/20180709111753eucas1p1f32e66fb2f7ea3216097cd72a132355d~-rzycA5Rg0378203782eucas1p1C@eucas1p1.samsung.com

> 

> Reported-by: Marek Szyprowski <m.szyprowski@samsung.com>

> Reviewed-by: Mark Brown <broonie@kernel.org>

> Signed-off-by: Benjamin Gaignard <benjamin.gaignard@st.com>


That's better. :-)

Reviewed-by: Rafael J. Wysocki <rafael@kernel.org>


> ---

>  drivers/base/core.c | 4 ++--

>  1 file changed, 2 insertions(+), 2 deletions(-)

> 

> diff --git a/drivers/base/core.c b/drivers/base/core.c

> index df3e1a44707a..fcdc17f0f349 100644

> --- a/drivers/base/core.c

> +++ b/drivers/base/core.c

> @@ -105,7 +105,7 @@ static int device_is_dependent(struct device *dev, void *target)

>  	struct device_link *link;

>  	int ret;

>  

> -	if (WARN_ON(dev == target))

> +	if (dev == target)

>  		return 1;

>  

>  	ret = device_for_each_child(dev, target, device_is_dependent);

> @@ -113,7 +113,7 @@ static int device_is_dependent(struct device *dev, void *target)

>  		return ret;

>  

>  	list_for_each_entry(link, &dev->links.consumers, s_node) {

> -		if (WARN_ON(link->consumer == target))

> +		if (link->consumer == target)

>  			return 1;

>  

>  		ret = device_is_dependent(link->consumer, target);

>

Patch

diff --git a/drivers/base/core.c b/drivers/base/core.c
index df3e1a44707a..fcdc17f0f349 100644
--- a/drivers/base/core.c
+++ b/drivers/base/core.c
@@ -105,7 +105,7 @@  static int device_is_dependent(struct device *dev, void *target)
 	struct device_link *link;
 	int ret;
 
-	if (WARN_ON(dev == target))
+	if (dev == target)
 		return 1;
 
 	ret = device_for_each_child(dev, target, device_is_dependent);
@@ -113,7 +113,7 @@  static int device_is_dependent(struct device *dev, void *target)
 		return ret;
 
 	list_for_each_entry(link, &dev->links.consumers, s_node) {
-		if (WARN_ON(link->consumer == target))
+		if (link->consumer == target)
 			return 1;
 
 		ret = device_is_dependent(link->consumer, target);