lkml.org 
[lkml]   [2014]   [Feb]   [1]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v2 5/6] ACPI / hotplug / PCI: Simplify acpi_install_hotplug_notify_handler()
    Date
    From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

    Since acpi_hotplug_notify_cb() does not use its data argument any
    more, the second argument of acpi_install_hotplug_notify_handler()
    can be dropped, so do that and update its callers accordingly.

    Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
    ---
    drivers/acpi/scan.c | 6 +++---
    drivers/pci/hotplug/acpiphp_glue.c | 2 +-
    include/acpi/acpi_bus.h | 2 +-
    3 files changed, 5 insertions(+), 5 deletions(-)

    Index: linux-pm/drivers/acpi/scan.c
    ===================================================================
    --- linux-pm.orig/drivers/acpi/scan.c
    +++ linux-pm/drivers/acpi/scan.c
    @@ -582,10 +582,10 @@ static void acpi_hotplug_notify_cb(acpi_
    acpi_evaluate_hotplug_ost(handle, type, ost_code, NULL);
    }

    -void acpi_install_hotplug_notify_handler(acpi_handle handle, void *data)
    +void acpi_install_hotplug_notify_handler(acpi_handle handle)
    {
    acpi_install_notify_handler(handle, ACPI_SYSTEM_NOTIFY,
    - acpi_hotplug_notify_cb, data);
    + acpi_hotplug_notify_cb, NULL);
    }

    void acpi_remove_hotplug_notify_handler(acpi_handle handle)
    @@ -2024,7 +2024,7 @@ static void acpi_scan_init_hotplug(acpi_
    list_for_each_entry(hwid, &pnp.ids, list) {
    handler = acpi_scan_match_handler(hwid->id, NULL);
    if (handler) {
    - acpi_install_hotplug_notify_handler(handle, handler);
    + acpi_install_hotplug_notify_handler(handle);
    break;
    }
    }
    Index: linux-pm/drivers/pci/hotplug/acpiphp_glue.c
    ===================================================================
    --- linux-pm.orig/drivers/pci/hotplug/acpiphp_glue.c
    +++ linux-pm/drivers/pci/hotplug/acpiphp_glue.c
    @@ -362,7 +362,7 @@ static acpi_status register_slot(acpi_ha

    /* install notify handler */
    if (!(newfunc->flags & FUNC_HAS_DCK))
    - acpi_install_hotplug_notify_handler(handle, NULL);
    + acpi_install_hotplug_notify_handler(handle);

    return AE_OK;
    }
    Index: linux-pm/include/acpi/acpi_bus.h
    ===================================================================
    --- linux-pm.orig/include/acpi/acpi_bus.h
    +++ linux-pm/include/acpi/acpi_bus.h
    @@ -443,7 +443,7 @@ static inline bool acpi_device_enumerate
    typedef void (*acpi_hp_callback)(void *data, u32 src);

    acpi_status acpi_hotplug_execute(acpi_hp_callback func, void *data, u32 src);
    -void acpi_install_hotplug_notify_handler(acpi_handle handle, void *data);
    +void acpi_install_hotplug_notify_handler(acpi_handle handle);
    void acpi_remove_hotplug_notify_handler(acpi_handle handle);

    /**


    \
     
     \ /
      Last update: 2014-02-02 02:21    [W:4.020 / U:0.020 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site