diff options
author | Rafael J. Wysocki <rjw@sisk.pl> | 2012-06-27 17:18:44 -0400 |
---|---|---|
committer | Rafael J. Wysocki <rjw@sisk.pl> | 2012-07-01 07:31:13 -0400 |
commit | fd3c3a424e43e4f85385de0c2609c490605611a6 (patch) | |
tree | e955d242a1ef39745789692eadc7a5b86972d7d9 /drivers/platform | |
parent | 6887a4131da3adaab011613776d865f4bcfb5678 (diff) |
thinkpad_acpi: Drop pm_message_t arguments from suspend routines
Multiple suspend routines in drivers/platform/x86/thinkpad_acpi.c
use take pm_message_t arguments that aren't used by any of them.
Make those routines take no arguments as that's what they should do.
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Acked-by: Henrique de Moraes Holschuh <hmh@hmh.eng.br>
Acked-by: Matthew Garrett <mjg@redhat.com>
Diffstat (limited to 'drivers/platform')
-rw-r--r-- | drivers/platform/x86/thinkpad_acpi.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/platform/x86/thinkpad_acpi.c b/drivers/platform/x86/thinkpad_acpi.c index 8b5610d88418..070e555d4bd8 100644 --- a/drivers/platform/x86/thinkpad_acpi.c +++ b/drivers/platform/x86/thinkpad_acpi.c | |||
@@ -277,7 +277,7 @@ struct ibm_struct { | |||
277 | int (*write) (char *); | 277 | int (*write) (char *); |
278 | void (*exit) (void); | 278 | void (*exit) (void); |
279 | void (*resume) (void); | 279 | void (*resume) (void); |
280 | void (*suspend) (pm_message_t state); | 280 | void (*suspend) (void); |
281 | void (*shutdown) (void); | 281 | void (*shutdown) (void); |
282 | 282 | ||
283 | struct list_head all_drivers; | 283 | struct list_head all_drivers; |
@@ -931,7 +931,7 @@ static int tpacpi_suspend_handler(struct platform_device *pdev, | |||
931 | &tpacpi_all_drivers, | 931 | &tpacpi_all_drivers, |
932 | all_drivers) { | 932 | all_drivers) { |
933 | if (ibm->suspend) | 933 | if (ibm->suspend) |
934 | (ibm->suspend)(state); | 934 | (ibm->suspend)(); |
935 | } | 935 | } |
936 | 936 | ||
937 | return 0; | 937 | return 0; |
@@ -3758,7 +3758,7 @@ static void hotkey_notify(struct ibm_struct *ibm, u32 event) | |||
3758 | } | 3758 | } |
3759 | } | 3759 | } |
3760 | 3760 | ||
3761 | static void hotkey_suspend(pm_message_t state) | 3761 | static void hotkey_suspend(void) |
3762 | { | 3762 | { |
3763 | /* Do these on suspend, we get the events on early resume! */ | 3763 | /* Do these on suspend, we get the events on early resume! */ |
3764 | hotkey_wakeup_reason = TP_ACPI_WAKEUP_NONE; | 3764 | hotkey_wakeup_reason = TP_ACPI_WAKEUP_NONE; |
@@ -6329,7 +6329,7 @@ static int __init brightness_init(struct ibm_init_struct *iibm) | |||
6329 | return 0; | 6329 | return 0; |
6330 | } | 6330 | } |
6331 | 6331 | ||
6332 | static void brightness_suspend(pm_message_t state) | 6332 | static void brightness_suspend(void) |
6333 | { | 6333 | { |
6334 | tpacpi_brightness_checkpoint_nvram(); | 6334 | tpacpi_brightness_checkpoint_nvram(); |
6335 | } | 6335 | } |
@@ -6748,7 +6748,7 @@ static struct snd_kcontrol_new volume_alsa_control_mute __devinitdata = { | |||
6748 | .get = volume_alsa_mute_get, | 6748 | .get = volume_alsa_mute_get, |
6749 | }; | 6749 | }; |
6750 | 6750 | ||
6751 | static void volume_suspend(pm_message_t state) | 6751 | static void volume_suspend(void) |
6752 | { | 6752 | { |
6753 | tpacpi_volume_checkpoint_nvram(); | 6753 | tpacpi_volume_checkpoint_nvram(); |
6754 | } | 6754 | } |
@@ -8107,7 +8107,7 @@ static void fan_exit(void) | |||
8107 | flush_workqueue(tpacpi_wq); | 8107 | flush_workqueue(tpacpi_wq); |
8108 | } | 8108 | } |
8109 | 8109 | ||
8110 | static void fan_suspend(pm_message_t state) | 8110 | static void fan_suspend(void) |
8111 | { | 8111 | { |
8112 | int rc; | 8112 | int rc; |
8113 | 8113 | ||