On Mon, Jan 11, 2016 at 3:26 PM, Aleksey Makarov
<aleksey.makarov@xxxxxxxxxx> wrote:
> Factor out the code that finds the first physical device
> of a given ACPI device. It is used in several places.
My comments below.
Otherwise good look to me if Rafael has no objections.
FWIW:
Reviewed-by: Andy Shevchenko <andy.shevchenko@xxxxxxxxx>
> --- 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;
> @@ -83,21 +82,8 @@ struct platform_device *acpi_create_platform_device(struct acpi_device *adev)
> * platform device we are about to create.
> */
> pdevinfo.parent = NULL;
No need to twice assign that, perhaps you may move to else branch of
the condition.
> - 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);
> - }
> + if (adev->parent)
> + pdevinfo.parent = acpi_get_first_physical_node(adev->parent);
else
pdevinfo.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..2048c69 100644
> --- a/drivers/acpi/bus.c
> +++ b/drivers/acpi/bus.c
> @@ -478,24 +478,36 @@ 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
> + * @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 *ret = NULL;
I would use ret -> node.
>
> mutex_lock(physical_node_lock);
> - if (list_empty(&adev->physical_node_list)) {
> - adev = 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;
> - }
> + if (!list_empty(&adev->physical_node_list))
> + ret = list_first_entry(&adev->physical_node_list,
> + struct acpi_device_physical_node, node)->dev;
> +
> mutex_unlock(physical_node_lock);
> - return adev;
> +
> + return ret;
> +}
> +
> +static struct acpi_device *acpi_primary_dev_companion(struct acpi_device *adev,
> + const struct device *dev)
> +{
> + const struct device *pdev = acpi_get_first_physical_node(adev);
Similar
pdev -> node.
> +
> + if (pdev && pdev == dev)
> + return adev;
> +
> + return 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.0
>
--
With Best Regards,
Andy Shevchenko
--
To unsubscribe from this list: send the line "unsubscribe linux-acpi" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
