[v1,2/2] ACPI: scan: Adjust white space in acpi_device_add()
diff mbox series

Message ID 8659794.ROA1lt5W1e@kreacher
State Accepted
Commit 5e73c5187cf4f40a5e02b6c8e4dd0fcf9686c006
Headers show
Series
  • ACPI: scan: Janitorial changes in acpi_device_add()
Related show

Commit Message

Rafael J. Wysocki Jan. 14, 2021, 6:47 p.m. UTC
From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

Add empty lines in some places in acpi_device_add() to help
readability and drop leading spaces before the labels in there.

No functional impact.

Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
---
 drivers/acpi/scan.c |    9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

Comments

Hans de Goede Jan. 16, 2021, 12:36 p.m. UTC | #1
Hi,

On 1/14/21 7:47 PM, Rafael J. Wysocki wrote:
> From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
> 
> Add empty lines in some places in acpi_device_add() to help
> readability and drop leading spaces before the labels in there.
> 
> No functional impact.
> 
> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

Patch looks good to me:

Reviewed-by: Hans de Goede <hdegoede@redhat.com>

Regards,

Hans



> ---
>  drivers/acpi/scan.c |    9 +++++++--
>  1 file changed, 7 insertions(+), 2 deletions(-)
> 
> Index: linux-pm/drivers/acpi/scan.c
> ===================================================================
> --- linux-pm.orig/drivers/acpi/scan.c
> +++ linux-pm/drivers/acpi/scan.c
> @@ -692,10 +692,12 @@ int acpi_device_add(struct acpi_device *
>  
>  	if (device->wakeup.flags.valid)
>  		list_add_tail(&device->wakeup_list, &acpi_wakeup_device_list);
> +
>  	mutex_unlock(&acpi_device_lock);
>  
>  	if (device->parent)
>  		device->dev.parent = &device->parent->dev;
> +
>  	device->dev.bus = &acpi_bus_type;
>  	device->dev.release = release;
>  	result = device_add(&device->dev);
> @@ -711,16 +713,19 @@ int acpi_device_add(struct acpi_device *
>  
>  	return 0;
>  
> - err:
> +err:
>  	mutex_lock(&acpi_device_lock);
> +
>  	if (device->parent)
>  		list_del(&device->node);
> +
>  	list_del(&device->wakeup_list);
>  
> - err_unlock:
> +err_unlock:
>  	mutex_unlock(&acpi_device_lock);
>  
>  	acpi_detach_data(device->handle, acpi_scan_drop_device);
> +
>  	return result;
>  }
>  
> 
> 
>

Patch
diff mbox series

Index: linux-pm/drivers/acpi/scan.c
===================================================================
--- linux-pm.orig/drivers/acpi/scan.c
+++ linux-pm/drivers/acpi/scan.c
@@ -692,10 +692,12 @@  int acpi_device_add(struct acpi_device *
 
 	if (device->wakeup.flags.valid)
 		list_add_tail(&device->wakeup_list, &acpi_wakeup_device_list);
+
 	mutex_unlock(&acpi_device_lock);
 
 	if (device->parent)
 		device->dev.parent = &device->parent->dev;
+
 	device->dev.bus = &acpi_bus_type;
 	device->dev.release = release;
 	result = device_add(&device->dev);
@@ -711,16 +713,19 @@  int acpi_device_add(struct acpi_device *
 
 	return 0;
 
- err:
+err:
 	mutex_lock(&acpi_device_lock);
+
 	if (device->parent)
 		list_del(&device->node);
+
 	list_del(&device->wakeup_list);
 
- err_unlock:
+err_unlock:
 	mutex_unlock(&acpi_device_lock);
 
 	acpi_detach_data(device->handle, acpi_scan_drop_device);
+
 	return result;
 }