diff mbox

[2/2] ACPI: Remove unused lockable in acpi_device_flags

Message ID 1350318870-5700-2-git-send-email-toshi.kani@hp.com (mailing list archive)
State Accepted, archived
Headers show

Commit Message

Toshi Kani Oct. 15, 2012, 4:34 p.m. UTC
Removed lockable in struct acpi_device_flags since it is no
longer used by any code. acpi_bus_hot_remove_device() cannot
use this flag because acpi_bus_trim() frees up its acpi_device
object. Furthermore, the dock driver calls _LCK method without
using this lockable flag.

Signed-off-by: Toshi Kani <toshi.kani@hp.com>
---
 drivers/acpi/scan.c     | 5 -----
 include/acpi/acpi_bus.h | 3 +--
 2 files changed, 1 insertion(+), 7 deletions(-)

Comments

Yasuaki Ishimatsu Oct. 17, 2012, 1:26 a.m. UTC | #1
2012/10/16 1:34, Toshi Kani wrote:
> Removed lockable in struct acpi_device_flags since it is no
> longer used by any code. acpi_bus_hot_remove_device() cannot
> use this flag because acpi_bus_trim() frees up its acpi_device
> object. Furthermore, the dock driver calls _LCK method without
> using this lockable flag.
> 
> Signed-off-by: Toshi Kani <toshi.kani@hp.com>

Looks good to me.
Reviewed-by: Yasuaki Ishimatsu <isimatu.yasuaki@jp.fujitsu.com>

> ---
>   drivers/acpi/scan.c     | 5 -----
>   include/acpi/acpi_bus.h | 3 +--
>   2 files changed, 1 insertion(+), 7 deletions(-)
> 
> diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c
> index ed87f43..19d3d4a 100644
> --- a/drivers/acpi/scan.c
> +++ b/drivers/acpi/scan.c
> @@ -1017,11 +1017,6 @@ static int acpi_bus_get_flags(struct acpi_device *device)
>   			device->flags.ejectable = 1;
>   	}
>   
> -	/* Presence of _LCK indicates 'lockable' */
> -	status = acpi_get_handle(device->handle, "_LCK", &temp);
> -	if (ACPI_SUCCESS(status))
> -		device->flags.lockable = 1;
> -
>   	/* Power resources cannot be power manageable. */
>   	if (device->device_type == ACPI_BUS_TYPE_POWER)
>   		return 0;
> diff --git a/include/acpi/acpi_bus.h b/include/acpi/acpi_bus.h
> index 0daa0fb..e8b2877 100644
> --- a/include/acpi/acpi_bus.h
> +++ b/include/acpi/acpi_bus.h
> @@ -144,12 +144,11 @@ struct acpi_device_flags {
>   	u32 bus_address:1;
>   	u32 removable:1;
>   	u32 ejectable:1;
> -	u32 lockable:1;
>   	u32 suprise_removal_ok:1;
>   	u32 power_manageable:1;
>   	u32 performance_manageable:1;
>   	u32 eject_pending:1;
> -	u32 reserved:23;
> +	u32 reserved:24;
>   };
>   
>   /* File System */
> 


--
To unsubscribe from this list: send the line "unsubscribe linux-acpi" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Toshi Kani Oct. 17, 2012, 1:56 p.m. UTC | #2
On Wed, 2012-10-17 at 10:26 +0900, Yasuaki Ishimatsu wrote:
> 2012/10/16 1:34, Toshi Kani wrote:
> > Removed lockable in struct acpi_device_flags since it is no
> > longer used by any code. acpi_bus_hot_remove_device() cannot
> > use this flag because acpi_bus_trim() frees up its acpi_device
> > object. Furthermore, the dock driver calls _LCK method without
> > using this lockable flag.
> > 
> > Signed-off-by: Toshi Kani <toshi.kani@hp.com>
> 
> Looks good to me.
> Reviewed-by: Yasuaki Ishimatsu <isimatu.yasuaki@jp.fujitsu.com>

Thanks Yasuaki for reviewing!
-Toshi


> > ---
> >   drivers/acpi/scan.c     | 5 -----
> >   include/acpi/acpi_bus.h | 3 +--
> >   2 files changed, 1 insertion(+), 7 deletions(-)
> > 
> > diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c
> > index ed87f43..19d3d4a 100644
> > --- a/drivers/acpi/scan.c
> > +++ b/drivers/acpi/scan.c
> > @@ -1017,11 +1017,6 @@ static int acpi_bus_get_flags(struct acpi_device *device)
> >   			device->flags.ejectable = 1;
> >   	}
> >   
> > -	/* Presence of _LCK indicates 'lockable' */
> > -	status = acpi_get_handle(device->handle, "_LCK", &temp);
> > -	if (ACPI_SUCCESS(status))
> > -		device->flags.lockable = 1;
> > -
> >   	/* Power resources cannot be power manageable. */
> >   	if (device->device_type == ACPI_BUS_TYPE_POWER)
> >   		return 0;
> > diff --git a/include/acpi/acpi_bus.h b/include/acpi/acpi_bus.h
> > index 0daa0fb..e8b2877 100644
> > --- a/include/acpi/acpi_bus.h
> > +++ b/include/acpi/acpi_bus.h
> > @@ -144,12 +144,11 @@ struct acpi_device_flags {
> >   	u32 bus_address:1;
> >   	u32 removable:1;
> >   	u32 ejectable:1;
> > -	u32 lockable:1;
> >   	u32 suprise_removal_ok:1;
> >   	u32 power_manageable:1;
> >   	u32 performance_manageable:1;
> >   	u32 eject_pending:1;
> > -	u32 reserved:23;
> > +	u32 reserved:24;
> >   };
> >   
> >   /* File System */
> > 
> 
> 


--
To unsubscribe from this list: send the line "unsubscribe linux-acpi" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Rafael Wysocki Oct. 24, 2012, 10:08 p.m. UTC | #3
On Wednesday 17 of October 2012 07:56:49 Toshi Kani wrote:
> On Wed, 2012-10-17 at 10:26 +0900, Yasuaki Ishimatsu wrote:
> > 2012/10/16 1:34, Toshi Kani wrote:
> > > Removed lockable in struct acpi_device_flags since it is no
> > > longer used by any code. acpi_bus_hot_remove_device() cannot
> > > use this flag because acpi_bus_trim() frees up its acpi_device
> > > object. Furthermore, the dock driver calls _LCK method without
> > > using this lockable flag.
> > > 
> > > Signed-off-by: Toshi Kani <toshi.kani@hp.com>
> > 
> > Looks good to me.
> > Reviewed-by: Yasuaki Ishimatsu <isimatu.yasuaki@jp.fujitsu.com>
> 
> Thanks Yasuaki for reviewing!

Applied to linux-pm.git/acpi-next as v3.8 material.

Thanks,
Rafael


> > > ---
> > >   drivers/acpi/scan.c     | 5 -----
> > >   include/acpi/acpi_bus.h | 3 +--
> > >   2 files changed, 1 insertion(+), 7 deletions(-)
> > > 
> > > diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c
> > > index ed87f43..19d3d4a 100644
> > > --- a/drivers/acpi/scan.c
> > > +++ b/drivers/acpi/scan.c
> > > @@ -1017,11 +1017,6 @@ static int acpi_bus_get_flags(struct acpi_device *device)
> > >   			device->flags.ejectable = 1;
> > >   	}
> > >   
> > > -	/* Presence of _LCK indicates 'lockable' */
> > > -	status = acpi_get_handle(device->handle, "_LCK", &temp);
> > > -	if (ACPI_SUCCESS(status))
> > > -		device->flags.lockable = 1;
> > > -
> > >   	/* Power resources cannot be power manageable. */
> > >   	if (device->device_type == ACPI_BUS_TYPE_POWER)
> > >   		return 0;
> > > diff --git a/include/acpi/acpi_bus.h b/include/acpi/acpi_bus.h
> > > index 0daa0fb..e8b2877 100644
> > > --- a/include/acpi/acpi_bus.h
> > > +++ b/include/acpi/acpi_bus.h
> > > @@ -144,12 +144,11 @@ struct acpi_device_flags {
> > >   	u32 bus_address:1;
> > >   	u32 removable:1;
> > >   	u32 ejectable:1;
> > > -	u32 lockable:1;
> > >   	u32 suprise_removal_ok:1;
> > >   	u32 power_manageable:1;
> > >   	u32 performance_manageable:1;
> > >   	u32 eject_pending:1;
> > > -	u32 reserved:23;
> > > +	u32 reserved:24;
> > >   };
> > >   
> > >   /* File System */
> > > 
> > 
> > 
> 
> 
>
Toshi Kani Oct. 25, 2012, 2:01 p.m. UTC | #4
On Thu, 2012-10-25 at 00:08 +0200, Rafael J. Wysocki wrote:
> On Wednesday 17 of October 2012 07:56:49 Toshi Kani wrote:
> > On Wed, 2012-10-17 at 10:26 +0900, Yasuaki Ishimatsu wrote:
> > > 2012/10/16 1:34, Toshi Kani wrote:
> > > > Removed lockable in struct acpi_device_flags since it is no
> > > > longer used by any code. acpi_bus_hot_remove_device() cannot
> > > > use this flag because acpi_bus_trim() frees up its acpi_device
> > > > object. Furthermore, the dock driver calls _LCK method without
> > > > using this lockable flag.
> > > > 
> > > > Signed-off-by: Toshi Kani <toshi.kani@hp.com>
> > > 
> > > Looks good to me.
> > > Reviewed-by: Yasuaki Ishimatsu <isimatu.yasuaki@jp.fujitsu.com>
> > 
> > Thanks Yasuaki for reviewing!
> 
> Applied to linux-pm.git/acpi-next as v3.8 material.

Cool! Thanks Rafael!
-Toshi


> Thanks,
> Rafael


--
To unsubscribe from this list: send the line "unsubscribe linux-acpi" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c
index ed87f43..19d3d4a 100644
--- a/drivers/acpi/scan.c
+++ b/drivers/acpi/scan.c
@@ -1017,11 +1017,6 @@  static int acpi_bus_get_flags(struct acpi_device *device)
 			device->flags.ejectable = 1;
 	}
 
-	/* Presence of _LCK indicates 'lockable' */
-	status = acpi_get_handle(device->handle, "_LCK", &temp);
-	if (ACPI_SUCCESS(status))
-		device->flags.lockable = 1;
-
 	/* Power resources cannot be power manageable. */
 	if (device->device_type == ACPI_BUS_TYPE_POWER)
 		return 0;
diff --git a/include/acpi/acpi_bus.h b/include/acpi/acpi_bus.h
index 0daa0fb..e8b2877 100644
--- a/include/acpi/acpi_bus.h
+++ b/include/acpi/acpi_bus.h
@@ -144,12 +144,11 @@  struct acpi_device_flags {
 	u32 bus_address:1;
 	u32 removable:1;
 	u32 ejectable:1;
-	u32 lockable:1;
 	u32 suprise_removal_ok:1;
 	u32 power_manageable:1;
 	u32 performance_manageable:1;
 	u32 eject_pending:1;
-	u32 reserved:23;
+	u32 reserved:24;
 };
 
 /* File System */