From patchwork Wed Dec 8 18:25:10 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?b?SGFubm8gQsODwrZjaw==?= X-Patchwork-Id: 391632 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id oB8ITq9f031144 for ; Wed, 8 Dec 2010 18:30:23 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756103Ab0LHSaV (ORCPT ); Wed, 8 Dec 2010 13:30:21 -0500 Received: from zucker.schokokeks.org ([78.46.69.5]:49767 "EHLO zucker.schokokeks.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753896Ab0LHSaU (ORCPT ); Wed, 8 Dec 2010 13:30:20 -0500 X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter1.kernel.org [140.211.167.41]); Wed, 08 Dec 2010 18:30:23 +0000 (UTC) X-Greylist: delayed 305 seconds by postgrey-1.27 at vger.kernel.org; Wed, 08 Dec 2010 13:30:20 EST Received: from laverne.localnet ([2001:bf0:c001:30:221:86ff:fe52:9dff]) (AUTH: PLAIN hanno-default@schokokeks.org, TLS: TLSv1/SSLv3, 256bits, AES256-SHA) by zucker.schokokeks.org with esmtp; Wed, 08 Dec 2010 19:25:13 +0100 id 0000000000020004.000000004CFFCD89.0000677A From: Hanno =?utf-8?q?B=C3=B6ck?= To: lenb@kernel.org Subject: [PATCH] acpi: const-ify functions Date: Wed, 8 Dec 2010 19:25:10 +0100 User-Agent: KMail/1.13.5 (Linux/2.6.36.1; KDE/4.5.4; x86_64; ; ) Cc: linux-kernel@vger.kernel.org, linux-acpi@vger.kernel.org MIME-Version: 1.0 Message-Id: <201012081925.10292.hanno@hboeck.de> Sender: linux-acpi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org diff -Naurp linux-acpi-1//drivers/acpi/battery.c linux-acpi-2/drivers/acpi/battery.c --- linux-acpi-1//drivers/acpi/battery.c 2010-12-08 18:42:26.187000005 +0100 +++ linux-acpi-2/drivers/acpi/battery.c 2010-12-08 18:42:53.595000204 +0100 @@ -851,7 +851,7 @@ DECLARE_FILE_FUNCTIONS(alarm); } static struct battery_file { - struct file_operations ops; + const struct file_operations ops; mode_t mode; const char *name; } acpi_battery_file[] = { diff -Naurp linux-acpi-1//drivers/acpi/dock.c linux-acpi-2/drivers/acpi/dock.c --- linux-acpi-1//drivers/acpi/dock.c 2010-12-08 18:42:26.147999998 +0100 +++ linux-acpi-2/drivers/acpi/dock.c 2010-12-08 18:42:53.608999978 +0100 @@ -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; }; @@ -589,7 +589,8 @@ EXPORT_SYMBOL_GPL(unregister_dock_notifi * 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 -Naurp linux-acpi-1//drivers/acpi/sleep.c linux-acpi-2/drivers/acpi/sleep.c --- linux-acpi-1//drivers/acpi/sleep.c 2010-12-08 18:42:27.559999989 +0100 +++ linux-acpi-2/drivers/acpi/sleep.c 2010-12-08 18:42:53.615000007 +0100 @@ -319,7 +319,7 @@ static int acpi_suspend_state_valid(susp } } -static struct platform_suspend_ops acpi_suspend_ops = { +static const struct platform_suspend_ops acpi_suspend_ops = { .valid = acpi_suspend_state_valid, .begin = acpi_suspend_begin, .prepare_late = acpi_pm_prepare, @@ -347,7 +347,7 @@ static int acpi_suspend_begin_old(suspen * The following callbacks are used if the pre-ACPI 2.0 suspend ordering has * been requested. */ -static struct platform_suspend_ops acpi_suspend_ops_old = { +static const struct platform_suspend_ops acpi_suspend_ops_old = { .valid = acpi_suspend_state_valid, .begin = acpi_suspend_begin_old, .prepare_late = acpi_pm_pre_suspend, @@ -498,7 +498,7 @@ static void acpi_pm_thaw(void) acpi_enable_all_runtime_gpes(); } -static struct platform_hibernation_ops acpi_hibernation_ops = { +static const struct platform_hibernation_ops acpi_hibernation_ops = { .begin = acpi_hibernation_begin, .end = acpi_pm_end, .pre_snapshot = acpi_pm_prepare, @@ -541,7 +541,7 @@ static int acpi_hibernation_begin_old(vo * The following callbacks are used if the pre-ACPI 2.0 suspend ordering has * been requested. */ -static struct platform_hibernation_ops acpi_hibernation_ops_old = { +static const struct platform_hibernation_ops acpi_hibernation_ops_old = { .begin = acpi_hibernation_begin_old, .end = acpi_pm_end, .pre_snapshot = acpi_pm_pre_suspend, diff -Naurp linux-acpi-1//drivers/acpi/video.c linux-acpi-2/drivers/acpi/video.c --- linux-acpi-1//drivers/acpi/video.c 2010-12-08 18:42:27.627999905 +0100 +++ linux-acpi-2/drivers/acpi/video.c 2010-12-08 18:42:53.621000001 +0100 @@ -260,7 +260,7 @@ static int acpi_video_set_brightness(str vd->brightness->levels[request_level]); } -static struct backlight_ops acpi_backlight_ops = { +static const struct backlight_ops acpi_backlight_ops = { .get_brightness = acpi_video_get_brightness, .update_status = acpi_video_set_brightness, }; diff -Naurp linux-acpi-1//include/acpi/acpi_drivers.h linux-acpi-2/include/acpi/acpi_drivers.h --- linux-acpi-1//include/acpi/acpi_drivers.h 2010-12-08 18:42:33.099000002 +0100 +++ linux-acpi-2/include/acpi/acpi_drivers.h 2010-12-08 18:42:53.628000001 +0100 @@ -119,8 +119,8 @@ void pci_acpi_crs_quirks(void); 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 ha 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_notif { } 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;