Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1334902 > unrolled thread

Re: [PATCH v6 1/2] ACPI: introduce a function to find the first physical device

Started by"Rafael J. Wysocki" <rjw@rjwysocki.net>
First post2016-02-16 02:20 +0100
Last post2016-02-16 20:20 +0100
Articles 3 — 2 participants

Back to article view | Back to linux.kernel

This discussion starts older than the indexed window; earlier articles aren't shown. The article labeled Started by below is the oldest one visible, not the original post.

Contents

  Re: [PATCH v6 1/2] ACPI: introduce a function to find the first physical device "Rafael J. Wysocki" <rjw@rjwysocki.net> - 2016-02-16 02:20 +0100
    [PATCH v6 1/2] ACPI: introduce a function to find the first physical device Aleksey Makarov <aleksey.makarov@linaro.org> - 2016-02-16 14:00 +0100
      Re: [PATCH v6 1/2] ACPI: introduce a function to find the first physical device "Rafael J. Wysocki" <rjw@rjwysocki.net> - 2016-02-16 20:20 +0100

#1334902 — Re: [PATCH v6 1/2] ACPI: introduce a function to find the first physical device

From"Rafael J. Wysocki" <rjw@rjwysocki.net>
Date2016-02-16 02:20 +0100
SubjectRe: [PATCH v6 1/2] ACPI: introduce a function to find the first physical device
Message-ID<r2Ct4-Dq-9@gated-at.bofh.it>
On Wednesday, January 20, 2016 08:29:26 PM Aleksey Makarov wrote:
> Factor out the code that finds the first physical device
> of a given ACPI device.  It is used in several places.
> 
> Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com>

I guess the above doesn't apply any more, does it?

> Signed-off-by: Aleksey Makarov <aleksey.makarov@linaro.org>
> ---
>  drivers/acpi/acpi_platform.c | 19 ++-----------------
>  drivers/acpi/bus.c           | 33 ++++++++++++++++++++++-----------
>  drivers/acpi/internal.h      |  1 +
>  3 files changed, 25 insertions(+), 28 deletions(-)
> 
> diff --git a/drivers/acpi/acpi_platform.c b/drivers/acpi/acpi_platform.c
> index 296b7a1..c3af108 100644
> --- a/drivers/acpi/acpi_platform.c
> +++ b/drivers/acpi/acpi_platform.c
> @@ -43,7 +43,6 @@ static const struct acpi_device_id forbidden_id_list[] = {
>  struct platform_device *acpi_create_platform_device(struct acpi_device *adev)
>  {
>  	struct platform_device *pdev = NULL;
> -	struct acpi_device *acpi_parent;
>  	struct platform_device_info pdevinfo;
>  	struct resource_entry *rentry;
>  	struct list_head resource_list;
> @@ -82,22 +81,8 @@ struct platform_device *acpi_create_platform_device(struct acpi_device *adev)
>  	 * attached to it, that physical device should be the parent of the
>  	 * platform device we are about to create.
>  	 */
> -	pdevinfo.parent = NULL;
> -	acpi_parent = adev->parent;
> -	if (acpi_parent) {
> -		struct acpi_device_physical_node *entry;
> -		struct list_head *list;
> -
> -		mutex_lock(&acpi_parent->physical_node_lock);
> -		list = &acpi_parent->physical_node_list;
> -		if (!list_empty(list)) {
> -			entry = list_first_entry(list,
> -					struct acpi_device_physical_node,
> -					node);
> -			pdevinfo.parent = entry->dev;
> -		}
> -		mutex_unlock(&acpi_parent->physical_node_lock);
> -	}
> +	pdevinfo.parent = adev->parent ?
> +		acpi_get_first_physical_node(adev->parent) : NULL;
>  	pdevinfo.name = dev_name(&adev->dev);
>  	pdevinfo.id = -1;
>  	pdevinfo.res = resources;
> diff --git a/drivers/acpi/bus.c b/drivers/acpi/bus.c
> index a212cef..832b26d 100644
> --- a/drivers/acpi/bus.c
> +++ b/drivers/acpi/bus.c
> @@ -478,24 +478,35 @@ static void acpi_device_remove_notify_handler(struct acpi_device *device)
>                               Device Matching
>     -------------------------------------------------------------------------- */
>  
> -static struct acpi_device *acpi_primary_dev_companion(struct acpi_device *adev,
> -						      const struct device *dev)
> +/**
> + * acpi_device_fix_parent - Get first physical node of an ACPI device

Please fix the function name here.

> + * @adev: ACPI device in question
> + */
> +struct device *acpi_get_first_physical_node(struct acpi_device *adev)
>  {
>  	struct mutex *physical_node_lock = &adev->physical_node_lock;
> +	struct device *node = NULL;
>  
>  	mutex_lock(physical_node_lock);
> -	if (list_empty(&adev->physical_node_list)) {
> -		adev = NULL;
> -	} else {
> -		const struct acpi_device_physical_node *node;
>  
> +	if (!list_empty(&adev->physical_node_list))
>  		node = list_first_entry(&adev->physical_node_list,
> -					struct acpi_device_physical_node, node);
> -		if (node->dev != dev)
> -			adev = NULL;
> -	}
> +				struct acpi_device_physical_node, node)->dev;
> +

No, you don't have to change all that code.

Exercise: rework this function with as few lines of code changed as you possibly can.

>  	mutex_unlock(physical_node_lock);
> -	return adev;
> +
> +	return node;
> +}
> +
> +static struct acpi_device *acpi_primary_dev_companion(struct acpi_device *adev,
> +						      const struct device *dev)
> +{
> +	const struct device *node = acpi_get_first_physical_node(adev);

s/node/phys_dev/ ?

> +
> +	if (node && node == dev)
> +		return adev;
> +
> +	return NULL;

return phys_dev && phys_dev == dev ? adev : NULL;

One line of code instead of 4.

>  }
>  
>  /**
> diff --git a/drivers/acpi/internal.h b/drivers/acpi/internal.h
> index 11d87bf..ee9312ba 100644
> --- a/drivers/acpi/internal.h
> +++ b/drivers/acpi/internal.h
> @@ -98,6 +98,7 @@ bool acpi_device_is_present(struct acpi_device *adev);
>  bool acpi_device_is_battery(struct acpi_device *adev);
>  bool acpi_device_is_first_physical_node(struct acpi_device *adev,
>  					const struct device *dev);
> +struct device *acpi_get_first_physical_node(struct acpi_device *adev);
>  
>  /* --------------------------------------------------------------------------
>                       Device Matching and Notification
> 

Thanks,
Rafael

[toc] | [next] | [standalone]

#1335338

FromAleksey Makarov <aleksey.makarov@linaro.org>
Date2016-02-16 14:00 +0100
Message-ID<r2Not-7Xf-11@gated-at.bofh.it>
In reply to#1334902
Factor out the code that finds the first physical device
of a given ACPI device.  It is used in several places.

Signed-off-by: Aleksey Makarov <aleksey.makarov@linaro.org>
---
 drivers/acpi/acpi_platform.c | 19 ++-----------------
 drivers/acpi/bus.c           | 26 ++++++++++++++++++++------
 drivers/acpi/internal.h      |  1 +
 3 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/drivers/acpi/acpi_platform.c b/drivers/acpi/acpi_platform.c
index 296b7a1..c3af108 100644
--- a/drivers/acpi/acpi_platform.c
+++ b/drivers/acpi/acpi_platform.c
@@ -43,7 +43,6 @@ static const struct acpi_device_id forbidden_id_list[] = {
 struct platform_device *acpi_create_platform_device(struct acpi_device *adev)
 {
 	struct platform_device *pdev = NULL;
-	struct acpi_device *acpi_parent;
 	struct platform_device_info pdevinfo;
 	struct resource_entry *rentry;
 	struct list_head resource_list;
@@ -82,22 +81,8 @@ struct platform_device *acpi_create_platform_device(struct acpi_device *adev)
 	 * attached to it, that physical device should be the parent of the
 	 * platform device we are about to create.
 	 */
-	pdevinfo.parent = NULL;
-	acpi_parent = adev->parent;
-	if (acpi_parent) {
-		struct acpi_device_physical_node *entry;
-		struct list_head *list;
-
-		mutex_lock(&acpi_parent->physical_node_lock);
-		list = &acpi_parent->physical_node_list;
-		if (!list_empty(list)) {
-			entry = list_first_entry(list,
-					struct acpi_device_physical_node,
-					node);
-			pdevinfo.parent = entry->dev;
-		}
-		mutex_unlock(&acpi_parent->physical_node_lock);
-	}
+	pdevinfo.parent = adev->parent ?
+		acpi_get_first_physical_node(adev->parent) : NULL;
 	pdevinfo.name = dev_name(&adev->dev);
 	pdevinfo.id = -1;
 	pdevinfo.res = resources;
diff --git a/drivers/acpi/bus.c b/drivers/acpi/bus.c
index a212cef..d27e0f4 100644
--- a/drivers/acpi/bus.c
+++ b/drivers/acpi/bus.c
@@ -478,24 +478,38 @@ static void acpi_device_remove_notify_handler(struct acpi_device *device)
                              Device Matching
    -------------------------------------------------------------------------- */
 
-static struct acpi_device *acpi_primary_dev_companion(struct acpi_device *adev,
-						      const struct device *dev)
+/**
+ * acpi_get_first_physical_node - Get first physical node of an ACPI device
+ * @adev:	ACPI device in question
+ *
+ * Return: First physical node of ACPI device @adev
+ */
+struct device *acpi_get_first_physical_node(struct acpi_device *adev)
 {
 	struct mutex *physical_node_lock = &adev->physical_node_lock;
+	struct device *phys_dev;
 
 	mutex_lock(physical_node_lock);
 	if (list_empty(&adev->physical_node_list)) {
-		adev = NULL;
+		phys_dev = NULL;
 	} else {
 		const struct acpi_device_physical_node *node;
 
 		node = list_first_entry(&adev->physical_node_list,
 					struct acpi_device_physical_node, node);
-		if (node->dev != dev)
-			adev = NULL;
+
+		phys_dev = node->dev;
 	}
 	mutex_unlock(physical_node_lock);
-	return adev;
+	return phys_dev;
+}
+
+static struct acpi_device *acpi_primary_dev_companion(struct acpi_device *adev,
+						      const struct device *dev)
+{
+	const struct device *phys_dev = acpi_get_first_physical_node(adev);
+
+	return phys_dev && phys_dev == dev ? adev : NULL;
 }
 
 /**
diff --git a/drivers/acpi/internal.h b/drivers/acpi/internal.h
index 11d87bf..ee9312ba 100644
--- a/drivers/acpi/internal.h
+++ b/drivers/acpi/internal.h
@@ -98,6 +98,7 @@ bool acpi_device_is_present(struct acpi_device *adev);
 bool acpi_device_is_battery(struct acpi_device *adev);
 bool acpi_device_is_first_physical_node(struct acpi_device *adev,
 					const struct device *dev);
+struct device *acpi_get_first_physical_node(struct acpi_device *adev);
 
 /* --------------------------------------------------------------------------
                      Device Matching and Notification
-- 
2.7.1

[toc] | [prev] | [next] | [standalone]

#1335735

From"Rafael J. Wysocki" <rjw@rjwysocki.net>
Date2016-02-16 20:20 +0100
Message-ID<r2Tke-3E0-7@gated-at.bofh.it>
In reply to#1335338
On Tuesday, February 16, 2016 03:52:38 PM Aleksey Makarov wrote:
> Factor out the code that finds the first physical device
> of a given ACPI device.  It is used in several places.
> 
> Signed-off-by: Aleksey Makarov <aleksey.makarov@linaro.org>

OK, I've queued up this one and the [2/2] for v4.6.

Thanks,
Rafael

[toc] | [prev] | [standalone]

Back to top | Article view | linux.kernel

csiph-web