From: "Rafael J. Wysocki" <rjw@sisk.pl>
To: platform-driver-x86@vger.kernel.org
Cc: Henrique de Moraes Holschuh <ibm-acpi@hmh.eng.br>,
LKML <linux-kernel@vger.kernel.org>,
Linux PM list <linux-pm@vger.kernel.org>,
Matthew Garrett <mjg59@srcf.ucam.org>, Joey Lee <jlee@novell.com>
Subject: [PATCH 1/5] thinkpad_acpi: Drop pm_message_t arguments from suspend routines
Date: Sun, 17 Jun 2012 22:27:23 +0200 [thread overview]
Message-ID: <201206172227.23591.rjw@sisk.pl> (raw)
In-Reply-To: <201206172226.42729.rjw@sisk.pl>
From: Rafael J. Wysocki <rjw@sisk.pl>
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>
---
drivers/platform/x86/thinkpad_acpi.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
Index: linux/drivers/platform/x86/thinkpad_acpi.c
===================================================================
--- linux.orig/drivers/platform/x86/thinkpad_acpi.c
+++ linux/drivers/platform/x86/thinkpad_acpi.c
@@ -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;
@@ -931,7 +931,7 @@ static int tpacpi_suspend_handler(struct
&tpacpi_all_drivers,
all_drivers) {
if (ibm->suspend)
- (ibm->suspend)(state);
+ (ibm->suspend)();
}
return 0;
@@ -3758,7 +3758,7 @@ static void hotkey_notify(struct ibm_str
}
}
-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;
@@ -6329,7 +6329,7 @@ static int __init brightness_init(struct
return 0;
}
-static void brightness_suspend(pm_message_t state)
+static void brightness_suspend(void)
{
tpacpi_brightness_checkpoint_nvram();
}
@@ -6748,7 +6748,7 @@ static struct snd_kcontrol_new volume_al
.get = volume_alsa_mute_get,
};
-static void volume_suspend(pm_message_t state)
+static void volume_suspend(void)
{
tpacpi_volume_checkpoint_nvram();
}
@@ -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;
next prev parent reply other threads:[~2012-06-17 20:26 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-06-17 20:26 [PATCH 0/5] platform / x86: Convert a few drivers to struct dev_pm_ops Rafael J. Wysocki
2012-06-17 20:27 ` Rafael J. Wysocki [this message]
2012-06-24 0:32 ` [PATCH 1/5] thinkpad_acpi: Drop pm_message_t arguments from suspend routines Henrique de Moraes Holschuh
2012-06-17 20:27 ` [PATCH 2/5] thinkpad_acpi: Use struct dev_pm_ops instead of legacy PM routines Rafael J. Wysocki
2012-06-24 0:34 ` Henrique de Moraes Holschuh
2012-06-24 20:01 ` Rafael J. Wysocki
2012-06-17 20:28 ` [PATCH 3/5] acer-wmi: Use struct dev_pm_ops for power management Rafael J. Wysocki
2012-06-18 6:56 ` joeyli
2012-06-17 20:29 ` [PATCH 4/5] intel_mid_thermal: " Rafael J. Wysocki
2012-06-18 6:03 ` R, Durgadoss
2012-06-17 20:30 ` [PATCH 5/5] intel_ips: Remove empty legacy PM callbacks Rafael J. Wysocki
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=201206172227.23591.rjw@sisk.pl \
--to=rjw@sisk.pl \
--cc=ibm-acpi@hmh.eng.br \
--cc=jlee@novell.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=mjg59@srcf.ucam.org \
--cc=platform-driver-x86@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox