OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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>
This commit is contained in:
Rafael J. Wysocki 2012-06-27 23:18:44 +02:00
parent 6887a4131d
commit fd3c3a424e
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/platform/x86/thinkpad_acpi.c
View File

@ -277,7 +277,7 @@ struct ibm_struct {
int (*write) (char *); int (*write) (char *);
void (*exit) (void); void (*exit) (void);
void (*resume) (void); void (*resume) (void);
void (*suspend) (pm_message_t state); void (*suspend) (void);
void (*shutdown) (void); void (*shutdown) (void);
struct list_head all_drivers; struct list_head all_drivers;
@ -931,7 +931,7 @@ static int tpacpi_suspend_handler(struct platform_device *pdev,
&tpacpi_all_drivers, &tpacpi_all_drivers,
all_drivers) { all_drivers) {
if (ibm->suspend) if (ibm->suspend)
(ibm->suspend)(state); (ibm->suspend)();
} }
return 0; return 0;
@ -3758,7 +3758,7 @@ static void hotkey_notify(struct ibm_struct *ibm, u32 event)
} }
} }
static void hotkey_suspend(pm_message_t state) static void hotkey_suspend(void)
{ {
/* Do these on suspend, we get the events on early resume! */ /* Do these on suspend, we get the events on early resume! */
hotkey_wakeup_reason = TP_ACPI_WAKEUP_NONE; hotkey_wakeup_reason = TP_ACPI_WAKEUP_NONE;
@ -6329,7 +6329,7 @@ static int __init brightness_init(struct ibm_init_struct *iibm)
return 0; return 0;
} }
static void brightness_suspend(pm_message_t state) static void brightness_suspend(void)
{ {
tpacpi_brightness_checkpoint_nvram(); tpacpi_brightness_checkpoint_nvram();
} }
@ -6748,7 +6748,7 @@ static struct snd_kcontrol_new volume_alsa_control_mute __devinitdata = {
.get = volume_alsa_mute_get, .get = volume_alsa_mute_get,
}; };
static void volume_suspend(pm_message_t state) static void volume_suspend(void)
{ {
tpacpi_volume_checkpoint_nvram(); tpacpi_volume_checkpoint_nvram();
} }
@ -8107,7 +8107,7 @@ static void fan_exit(void)
flush_workqueue(tpacpi_wq); flush_workqueue(tpacpi_wq);
} }
static void fan_suspend(pm_message_t state) static void fan_suspend(void)
{ {
int rc; int rc;