Skip to content

Commit

Permalink
thinkpad_acpi: Drop pm_message_t arguments from suspend routines
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Rafael J. Wysocki committed Jul 1, 2012
1 parent 6887a41 commit fd3c3a4
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions drivers/platform/x86/thinkpad_acpi.c
Original file line number Diff line number Diff line change
Expand Up @@ -277,7 +277,7 @@ struct ibm_struct {
int (*write) (char *);
void (*exit) (void);
void (*resume) (void);
void (*suspend) (pm_message_t state);
void (*suspend) (void);
void (*shutdown) (void);

struct list_head all_drivers;
Expand Down Expand Up @@ -931,7 +931,7 @@ static int tpacpi_suspend_handler(struct platform_device *pdev,
&tpacpi_all_drivers,
all_drivers) {
if (ibm->suspend)
(ibm->suspend)(state);
(ibm->suspend)();
}

return 0;
Expand Down Expand Up @@ -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! */
hotkey_wakeup_reason = TP_ACPI_WAKEUP_NONE;
Expand Down Expand Up @@ -6329,7 +6329,7 @@ static int __init brightness_init(struct ibm_init_struct *iibm)
return 0;
}

static void brightness_suspend(pm_message_t state)
static void brightness_suspend(void)
{
tpacpi_brightness_checkpoint_nvram();
}
Expand Down Expand Up @@ -6748,7 +6748,7 @@ static struct snd_kcontrol_new volume_alsa_control_mute __devinitdata = {
.get = volume_alsa_mute_get,
};

static void volume_suspend(pm_message_t state)
static void volume_suspend(void)
{
tpacpi_volume_checkpoint_nvram();
}
Expand Down Expand Up @@ -8107,7 +8107,7 @@ static void fan_exit(void)
flush_workqueue(tpacpi_wq);
}

static void fan_suspend(pm_message_t state)
static void fan_suspend(void)
{
int rc;

Expand Down

0 comments on commit fd3c3a4

Please sign in to comment.