libata-acpi.c ata_acpi_register_power_resource copy and paste mistake ?

libata-acpi.c ata_acpi_register_power_resource copy and paste mistake ?

[Sander Eikelenboom]

Hi Jeff,

During the last merge of ahci code (d9978ec5680059d727b39d6c706777c6973587f2), i saw this coming by:


--- a/drivers/ata/libata-acpi.c
+++ b/drivers/ata/libata-acpi.c
@@ -1024,30 +1024,20 @@ static void ata_acpi_register_power_resource(struct ata_device *dev)
 {
        struct scsi_device *sdev = dev->sdev;
        acpi_handle handle;
-       struct device *device;
 
        handle = ata_dev_acpi_handle(dev);
-       if (!handle)
-               return;
-
-       device = &sdev->sdev_gendev;
-
-       acpi_power_resource_register_device(device, handle);
+       if (handle)
+               acpi_dev_pm_remove_dependent(handle, &sdev->sdev_gendev);
 }

shouldn't:

acpi_dev_pm_remove_dependent(handle, &sdev->sdev_gendev);

be

acpi_dev_pm_add_dependent(handle, &sdev->sdev_gendev);

in the ata_acpi_register_power_resource function ?

(seems like a copy and paste mistake from the unregister function)

--
Sander

Re: libata-acpi.c ata_acpi_register_power_resource copy and paste mistake ?

[Aaron Lu]

+Rafael

commit bc9b6407bd6df3ab7189e5622816bbc11ae9d2d8
Author: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date:   Thu Jan 17 14:11:05 2013 +0100

    ACPI / PM: Rework the handling of devices depending on power resources

-Aaron

On 03/01/2013 12:45 AM, Sander Eikelenboom wrote:
> Hi Jeff,
> 
> During the last merge of ahci code (d9978ec5680059d727b39d6c706777c6973587f2), i saw this coming by:
> 
> 
> --- a/drivers/ata/libata-acpi.c
> +++ b/drivers/ata/libata-acpi.c
> @@ -1024,30 +1024,20 @@ static void ata_acpi_register_power_resource(struct ata_device *dev)
>  {
>         struct scsi_device *sdev = dev->sdev;
>         acpi_handle handle;
> -       struct device *device;
>  
>         handle = ata_dev_acpi_handle(dev);
> -       if (!handle)
> -               return;
> -
> -       device = &sdev->sdev_gendev;
> -
> -       acpi_power_resource_register_device(device, handle);
> +       if (handle)
> +               acpi_dev_pm_remove_dependent(handle, &sdev->sdev_gendev);
>  }
> 
> shouldn't:
> 
> acpi_dev_pm_remove_dependent(handle, &sdev->sdev_gendev);
> 
> be
> 
> acpi_dev_pm_add_dependent(handle, &sdev->sdev_gendev);
> 
> in the ata_acpi_register_power_resource function ?
> 
> (seems like a copy and paste mistake from the unregister function)
> 
> --
> Sander
> 
> 
> 
> --
> To unsubscribe from this list: send the line "unsubscribe linux-ide" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> 

Re: libata-acpi.c ata_acpi_register_power_resource copy and paste mistake ?

[Rafael J. Wysocki]

On Friday, March 01, 2013 09:59:41 AM Aaron Lu wrote:
> +Rafael
> 
> commit bc9b6407bd6df3ab7189e5622816bbc11ae9d2d8
> Author: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
> Date:   Thu Jan 17 14:11:05 2013 +0100
> 
>     ACPI / PM: Rework the handling of devices depending on power resources
> 
> -Aaron

Thanks Aaron!

> On 03/01/2013 12:45 AM, Sander Eikelenboom wrote:
> > Hi Jeff,
> > 
> > During the last merge of ahci code (d9978ec5680059d727b39d6c706777c6973587f2), i saw this coming by:
> > 
> > 
> > --- a/drivers/ata/libata-acpi.c
> > +++ b/drivers/ata/libata-acpi.c
> > @@ -1024,30 +1024,20 @@ static void ata_acpi_register_power_resource(struct ata_device *dev)
> >  {
> >         struct scsi_device *sdev = dev->sdev;
> >         acpi_handle handle;
> > -       struct device *device;
> >  
> >         handle = ata_dev_acpi_handle(dev);
> > -       if (!handle)
> > -               return;
> > -
> > -       device = &sdev->sdev_gendev;
> > -
> > -       acpi_power_resource_register_device(device, handle);
> > +       if (handle)
> > +               acpi_dev_pm_remove_dependent(handle, &sdev->sdev_gendev);
> >  }
> > 
> > shouldn't:
> > 
> > acpi_dev_pm_remove_dependent(handle, &sdev->sdev_gendev);
> > 
> > be
> > 
> > acpi_dev_pm_add_dependent(handle, &sdev->sdev_gendev);
> > 
> > in the ata_acpi_register_power_resource function ?
> > 
> > (seems like a copy and paste mistake from the unregister function)

Yes.  Sorry, my bad.

If you can prepare a patch fixing this, please do that, or I'll do it tomorrow.

Thanks,
Rafael


-- 
I speak only for myself.
Rafael J. Wysocki, Intel Open Source Technology Center.

[PATCH] libata-acpi.c: fix copy and paste mistake in ata_acpi_register_power_resource

[Sander Eikelenboom]

Fix a copy and paste mistake introduced in:

commit bc9b6407bd6df3ab7189e5622816bbc11ae9d2d8
"ACPI / PM: Rework the handling of devices depending on power resources"

Signed-off-by: Sander Eikelenboom <linux@eikelenboom.it>
---
 drivers/ata/libata-acpi.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/ata/libata-acpi.c b/drivers/ata/libata-acpi.c
index 0ea1018..cb3eab6d 100644
--- a/drivers/ata/libata-acpi.c
+++ b/drivers/ata/libata-acpi.c
@@ -1027,7 +1027,7 @@ static void ata_acpi_register_power_resource(struct ata_device *dev)
 
 	handle = ata_dev_acpi_handle(dev);
 	if (handle)
-		acpi_dev_pm_remove_dependent(handle, &sdev->sdev_gendev);
+		acpi_dev_pm_add_dependent(handle, &sdev->sdev_gendev);
 }
 
 static void ata_acpi_unregister_power_resource(struct ata_device *dev)
-- 
1.7.2.5

Re: [PATCH] libata-acpi.c: fix copy and paste mistake in ata_acpi_register_power_resource

[Rafael J. Wysocki]

On Friday, March 01, 2013 12:16:42 PM Sander Eikelenboom wrote:
> Fix a copy and paste mistake introduced in:
> 
> commit bc9b6407bd6df3ab7189e5622816bbc11ae9d2d8
> "ACPI / PM: Rework the handling of devices depending on power resources"
> 
> Signed-off-by: Sander Eikelenboom <linux@eikelenboom.it>

Acked-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

> ---
>  drivers/ata/libata-acpi.c |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/drivers/ata/libata-acpi.c b/drivers/ata/libata-acpi.c
> index 0ea1018..cb3eab6d 100644
> --- a/drivers/ata/libata-acpi.c
> +++ b/drivers/ata/libata-acpi.c
> @@ -1027,7 +1027,7 @@ static void ata_acpi_register_power_resource(struct ata_device *dev)
>  
>  	handle = ata_dev_acpi_handle(dev);
>  	if (handle)
> -		acpi_dev_pm_remove_dependent(handle, &sdev->sdev_gendev);
> +		acpi_dev_pm_add_dependent(handle, &sdev->sdev_gendev);
>  }
>  
>  static void ata_acpi_unregister_power_resource(struct ata_device *dev)
> 
-- 
I speak only for myself.
Rafael J. Wysocki, Intel Open Source Technology Center.

Re: [PATCH] libata-acpi.c: fix copy and paste mistake in ata_acpi_register_power_resource

[Jeff Garzik]

On 03/01/2013 06:16 AM, Sander Eikelenboom wrote:
> Fix a copy and paste mistake introduced in:
>
> commit bc9b6407bd6df3ab7189e5622816bbc11ae9d2d8
> "ACPI / PM: Rework the handling of devices depending on power resources"
>
> Signed-off-by: Sander Eikelenboom <linux@eikelenboom.it>
> ---
>   drivers/ata/libata-acpi.c |    2 +-
>   1 files changed, 1 insertions(+), 1 deletions(-)

applied

Re: [PATCH] libata-acpi.c: fix copy and paste mistake in ata_acpi_register_power_resource

[Sedat Dilek]

Original posting see [1].

Good catch!

Latest Linux-Next (next-20130301) is also affected!

The patch can be easily grabbed from [2].

Sander pointed to the mismatch in [3].

- Sedat -

[1] http://marc.info/?l=linux-kernel&m=136213666529000&w=2
[2] https://patchwork.kernel.org/patch/2200901/
[3] http://git.kernel.org/?p=linux/kernel/git/torvalds/linux.git;a=commitdiff;h=bc9b6407bd6df3ab7189e5622816bbc11ae9d2d8#patch5