by Rafael J. Wysocki

[permalink] [raw]

Subject: Re: [PATCH v3 00/10] minor improvements for ACPI dock and acpiphp drivers

On Saturday, June 29, 2013 12:24:33 AM Jiang Liu wrote:
> From: Jiang Liu <[email protected]>
>
> This is an following up patchset of "[PATCH 0/3] ACPI / dock / PCI: Fix
> problems with dock and PCI hotplug" with minor code cleanups and
> refinements. It applies to
> git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git linux-next
>
> Due to hardware resource limitation, I have only done compilation and
> boot tests.
>
> V2->V3:
> The first four patches are the same as previous version and rework
> all other patches according to review comments.
>
> Jiang Liu (10):
> ACPI, DOCK: avoid initializing acpi_dock_notifier_list multiple times
> ACPI, DOCK: kill redundant spin lock in dock station object
> ACPI, DOCK: mark initialization functions with __init
> ACPI, DOCK: simplify implementation of dock_create_acpi_device()
> ACPI: introduce helper function acpi_has_method()
> ACPI: introduce helper function acpi_execute_simple_method()
> ACPI: introduce two helper functions to simplify code
> ACPI: change acpi_[bay|dock]_match() in scan.c as global functions
> ACPI: simplify dock driver with new helper functions
> ACPI: simplify acpiphp driver with new helper functions
>
> drivers/acpi/battery.c | 19 +---
> drivers/acpi/bus.c | 6 +-
> drivers/acpi/dock.c | 152 ++++-------------------------
> drivers/acpi/ec.c | 4 +-
> drivers/acpi/power.c | 4 +-
> drivers/acpi/processor_perflib.c | 22 ++---
> drivers/acpi/resource.c | 4 +-
> drivers/acpi/scan.c | 189 +++++++++++++------------------------
> drivers/acpi/sleep.c | 7 +-
> drivers/acpi/thermal.c | 18 +---
> drivers/acpi/utils.c | 70 ++++++++++++++
> drivers/acpi/video.c | 56 ++++-------
> drivers/acpi/video_detect.c | 19 ++--
> drivers/pci/hotplug/acpiphp_glue.c | 30 ++----
> include/acpi/acpi_bus.h | 10 ++
> 15 files changed, 218 insertions(+), 392 deletions(-)

Looks good, thanks!

I'll queue all 10 up for 3.12.

Rafael

2013-06-28 18:33:26

by Rafael J. Wysocki

[permalink] [raw]

Subject: Re: [PATCH v3 10/10] ACPI: simplify acpiphp driver with new helper functions

On Friday, June 28, 2013 11:20:21 AM Bjorn Helgaas wrote:
> On Fri, Jun 28, 2013 at 10:24 AM, Jiang Liu <[email protected]> wrote:
> > From: Jiang Liu <[email protected]>
> >
> > Use new helper functions to simplify acpiphp driver.
> >
> > Signed-off-by: Jiang Liu <[email protected]>
>
> Acked-by: Bjorn Helgaas <[email protected]>
>
> I assume this will be merged via linux-pm with the rest of the series.

Yup, into 3.12.

Thanks,
Rafael

> > Cc: Jiang Liu <[email protected]>
> > Cc: Bjorn Helgaas <[email protected]>
> > Cc: Yinghai Lu <[email protected]>
> > Cc: Len Brown <[email protected]>
> > Cc: "Rafael J. Wysocki" <[email protected]>
> > Cc: Yijing Wang <[email protected]>
> > Cc: [email protected]
> > Cc: [email protected]
> > Cc: [email protected]
> > ---
> > drivers/pci/hotplug/acpiphp_glue.c | 30 ++++++++----------------------
> > 1 file changed, 8 insertions(+), 22 deletions(-)
> >
> > diff --git a/drivers/pci/hotplug/acpiphp_glue.c b/drivers/pci/hotplug/acpiphp_glue.c
> > index 59df857..a0a7133 100644
> > --- a/drivers/pci/hotplug/acpiphp_glue.c
> > +++ b/drivers/pci/hotplug/acpiphp_glue.c
> > @@ -201,7 +201,6 @@ register_slot(acpi_handle handle, u32 lvl, void *context, void **rv)
> > struct acpiphp_bridge *bridge = (struct acpiphp_bridge *)context;
> > struct acpiphp_slot *slot;
> > struct acpiphp_func *newfunc;
> > - acpi_handle tmp;
> > acpi_status status = AE_OK;
> > unsigned long long adr, sun;
> > int device, function, retval, found = 0;
> > @@ -232,19 +231,19 @@ register_slot(acpi_handle handle, u32 lvl, void *context, void **rv)
> > newfunc->handle = handle;
> > newfunc->function = function;
> >
> > - if (ACPI_SUCCESS(acpi_get_handle(handle, "_EJ0", &tmp)))
> > + if (acpi_has_method(handle, "_EJ0"))
> > newfunc->flags = FUNC_HAS_EJ0;
> >
> > - if (ACPI_SUCCESS(acpi_get_handle(handle, "_STA", &tmp)))
> > + if (acpi_has_method(handle, "_STA"))
> > newfunc->flags |= FUNC_HAS_STA;
> >
> > - if (ACPI_SUCCESS(acpi_get_handle(handle, "_PS0", &tmp)))
> > + if (acpi_has_method(handle, "_PS0"))
> > newfunc->flags |= FUNC_HAS_PS0;
> >
> > - if (ACPI_SUCCESS(acpi_get_handle(handle, "_PS3", &tmp)))
> > + if (acpi_has_method(handle, "_PS3"))
> > newfunc->flags |= FUNC_HAS_PS3;
> >
> > - if (ACPI_SUCCESS(acpi_get_handle(handle, "_DCK", &tmp)))
> > + if (acpi_has_method(handle, "_DCK"))
> > newfunc->flags |= FUNC_HAS_DCK;
> >
> > status = acpi_evaluate_integer(handle, "_SUN", NULL, &sun);
> > @@ -843,25 +842,14 @@ static unsigned int get_slot_status(struct acpiphp_slot *slot)
> > */
> > int acpiphp_eject_slot(struct acpiphp_slot *slot)
> > {
> > - acpi_status status;
> > struct acpiphp_func *func;
> > - struct acpi_object_list arg_list;
> > - union acpi_object arg;
> >
> > list_for_each_entry(func, &slot->funcs, sibling) {
> > /* We don't want to call _EJ0 on non-existing functions. */
> > if ((func->flags & FUNC_HAS_EJ0)) {
> > - /* _EJ0 method take one argument */
> > - arg_list.count = 1;
> > - arg_list.pointer = &arg;
> > - arg.type = ACPI_TYPE_INTEGER;
> > - arg.integer.value = 1;
> > -
> > - status = acpi_evaluate_object(func->handle, "_EJ0", &arg_list, NULL);
> > - if (ACPI_FAILURE(status)) {
> > - warn("%s: _EJ0 failed\n", __func__);
> > + if (ACPI_FAILURE(acpi_evaluate_ej0(func->handle)))
> > return -1;
> > - } else
> > + else
> > break;
> > }
> > }
> > @@ -1171,7 +1159,6 @@ static void handle_hotplug_event_func(acpi_handle handle, u32 type,
> > */
> > void acpiphp_enumerate_slots(struct pci_bus *bus, acpi_handle handle)
> > {
> > - acpi_handle dummy_handle;
> > struct acpiphp_bridge *bridge;
> >
> > if (acpiphp_disabled)
> > @@ -1200,8 +1187,7 @@ void acpiphp_enumerate_slots(struct pci_bus *bus, acpi_handle handle)
> > get_device(&bus->dev);
> >
> > if (!pci_is_root_bus(bridge->pci_bus) &&
> > - ACPI_SUCCESS(acpi_get_handle(bridge->handle,
> > - "_EJ0", &dummy_handle))) {
> > + acpi_has_method(bridge->handle, "_EJ0")) {
> > dbg("found ejectable p2p bridge\n");
> > bridge->flags |= BRIDGE_HAS_EJ0;
> > bridge->func = acpiphp_bridge_handle_to_function(handle);
> > --
> > 1.8.1.2
> >
--
I speak only for myself.
Rafael J. Wysocki, Intel Open Source Technology Center.