Re: [PATCH] ACPI: dock: Remove redundant ACPI NS walk

[Rafael J. Wysocki]

On Thursday 11 of October 2012 09:29:45 Toshi Kani wrote:
> Hi Len,
> 
> Can you please review this patch?

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

Thanks,
Rafael


> On Wed, 2012-10-10 at 07:20 -0600, Toshi Kani wrote:
> > On Wed, 2012-10-10 at 10:14 +0900, Yasuaki Ishimatsu wrote:
> > > Hi Toshi,
> > > 
> > > Sorry for late reply.
> > > 
> > > 2012/09/13 5:30, Toshi Kani wrote:
> > > > Combined two ACPI namespace walks, which look for dock stations
> > > > and then bays separately, into a single walk.
> > > > 
> > > > Signed-off-by: Toshi Kani <toshi.kani@xxxxxx>
> > > > ---
> > > 
> > > I have not tested the patch. But it looks good to me.
> > > 
> > > Reviewed-by: Yasuaki Ishimatsu <isimatu.yasuaki@xxxxxxxxxxxxxx>
> > 
> > Hi Yasuaki,
> > 
> > Thanks for the review!  I did test the patch with _DCK and PNP0C0A in
> > ACPI.
> > 
> > -Toshi
> > 
> > 
> > > 
> > > Thanks,
> > > Yasuaki Ishimatsu
> > > 
> > > >   drivers/acpi/dock.c |   26 +++++++-------------------
> > > >   1 files changed, 7 insertions(+), 19 deletions(-)
> > > > 
> > > > diff --git a/drivers/acpi/dock.c b/drivers/acpi/dock.c
> > > > index 88eb143..ae4ebf2 100644
> > > > --- a/drivers/acpi/dock.c
> > > > +++ b/drivers/acpi/dock.c
> > > > @@ -1016,44 +1016,32 @@ static int dock_remove(struct dock_station *ds)
> > > >   }
> > > >   
> > > >   /**
> > > > - * find_dock - look for a dock station
> > > > + * find_dock_and_bay - look for dock stations and bays
> > > >    * @handle: acpi handle of a device
> > > >    * @lvl: unused
> > > > - * @context: counter of dock stations found
> > > > + * @context: unused
> > > >    * @rv: unused
> > > >    *
> > > > - * This is called by acpi_walk_namespace to look for dock stations.
> > > > + * This is called by acpi_walk_namespace to look for dock stations and bays.
> > > >    */
> > > >   static __init acpi_status
> > > > -find_dock(acpi_handle handle, u32 lvl, void *context, void **rv)
> > > > +find_dock_and_bay(acpi_handle handle, u32 lvl, void *context, void **rv)
> > > >   {
> > > > -	if (is_dock(handle))
> > > > +	if (is_dock(handle) || is_ejectable_bay(handle))
> > > >   		dock_add(handle);
> > > >   
> > > >   	return AE_OK;
> > > >   }
> > > >   
> > > > -static __init acpi_status
> > > > -find_bay(acpi_handle handle, u32 lvl, void *context, void **rv)
> > > > -{
> > > > -	/* If bay is a dock, it's already handled */
> > > > -	if (is_ejectable_bay(handle) && !is_dock(handle))
> > > > -		dock_add(handle);
> > > > -	return AE_OK;
> > > > -}
> > > > -
> > > >   static int __init dock_init(void)
> > > >   {
> > > >   	if (acpi_disabled)
> > > >   		return 0;
> > > >   
> > > > -	/* look for a dock station */
> > > > +	/* look for dock stations and bays */
> > > >   	acpi_walk_namespace(ACPI_TYPE_DEVICE, ACPI_ROOT_OBJECT,
> > > > -			    ACPI_UINT32_MAX, find_dock, NULL, NULL, NULL);
> > > > +		ACPI_UINT32_MAX, find_dock_and_bay, NULL, NULL, NULL);
> > > >   
> > > > -	/* look for bay */
> > > > -	acpi_walk_namespace(ACPI_TYPE_DEVICE, ACPI_ROOT_OBJECT,
> > > > -			ACPI_UINT32_MAX, find_bay, NULL, NULL, NULL);
> > > >   	if (!dock_station_count) {
> > > >   		printk(KERN_INFO PREFIX "No dock devices found.\n");
> > > >   		return 0;
> > > > 
> > > 
> > > 
> > 
> > 
> > --
> > To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> > the body of a message to majordomo@xxxxxxxxxxxxxxx
> > More majordomo info at  http://vger.kernel.org/majordomo-info.html
> > Please read the FAQ at  http://www.tux.org/lkml/
> 
> 
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to majordomo@xxxxxxxxxxxxxxx
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at  http://www.tux.org/lkml/
> 
-- 
I speak only for myself.
Rafael J. Wysocki, Intel Open Source Technology Center.
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/