lkml.org 
[lkml]   [2009]   [Dec]   [13]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 1/3] Constify struct acpi_dock_ops for 2.6.32-git-053fe57ac v2
    Date
    From: Emese Revfy <re.emese@gmail.com>


    Signed-off-by: Emese Revfy <re.emese@gmail.com>
    ---
    drivers/acpi/dock.c | 4 ++--
    include/acpi/acpi_drivers.h | 8 ++++----
    2 files changed, 6 insertions(+), 6 deletions(-)

    diff --git a/drivers/acpi/dock.c b/drivers/acpi/dock.c
    index 30be3c1..b3a5492 100644
    --- a/drivers/acpi/dock.c
    +++ b/drivers/acpi/dock.c
    @@ -77,7 +77,7 @@ struct dock_dependent_device {
    struct list_head list;
    struct list_head hotplug_list;
    acpi_handle handle;
    - struct acpi_dock_ops *ops;
    + const struct acpi_dock_ops *ops;
    void *context;
    };

    @@ -605,7 +605,7 @@ EXPORT_SYMBOL_GPL(unregister_dock_notifier);
    * the dock driver after _DCK is executed.
    */
    int
    -register_hotplug_dock_device(acpi_handle handle, struct acpi_dock_ops *ops,
    +register_hotplug_dock_device(acpi_handle handle, const struct acpi_dock_ops *ops,
    void *context)
    {
    struct dock_dependent_device *dd;
    diff --git a/include/acpi/acpi_drivers.h b/include/acpi/acpi_drivers.h
    index f4906f6..71feb73 100644
    --- a/include/acpi/acpi_drivers.h
    +++ b/include/acpi/acpi_drivers.h
    @@ -119,8 +119,8 @@ int acpi_processor_set_thermal_limit(acpi_handle handle, int type);
    Dock Station
    -------------------------------------------------------------------------- */
    struct acpi_dock_ops {
    - acpi_notify_handler handler;
    - acpi_notify_handler uevent;
    + const acpi_notify_handler handler;
    + const acpi_notify_handler uevent;
    };

    #if defined(CONFIG_ACPI_DOCK) || defined(CONFIG_ACPI_DOCK_MODULE)
    @@ -128,7 +128,7 @@ extern int is_dock_device(acpi_handle handle);
    extern int register_dock_notifier(struct notifier_block *nb);
    extern void unregister_dock_notifier(struct notifier_block *nb);
    extern int register_hotplug_dock_device(acpi_handle handle,
    - struct acpi_dock_ops *ops,
    + const struct acpi_dock_ops *ops,
    void *context);
    extern void unregister_hotplug_dock_device(acpi_handle handle);
    #else
    @@ -144,7 +144,7 @@ static inline void unregister_dock_notifier(struct notifier_block *nb)
    {
    }
    static inline int register_hotplug_dock_device(acpi_handle handle,
    - struct acpi_dock_ops *ops,
    + const struct acpi_dock_ops *ops,
    void *context)
    {
    return -ENODEV;
    --
    1.6.5.3


    \
     
     \ /
      Last update: 2009-12-14 01:29    [W:4.206 / U:0.580 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site