diff options
| author | Ruchi Kandoi <kandoiruchi@google.com> | 2014-02-20 19:47:38 -0800 |
|---|---|---|
| committer | Ruchi Kandoi <kandoiruchi@google.com> | 2014-02-21 04:16:10 +0000 |
| commit | 39129eff0f76e66f50ad604c5a68630816acb7ba (patch) | |
| tree | e5dfe2b041a8c952c0a4d346fbebd93387f7cc70 /kernel | |
| parent | 520bc0723d8046c97b43c41080a425f007e89b31 (diff) | |
| download | olio-linux-3.10-39129eff0f76e66f50ad604c5a68630816acb7ba.tar.xz olio-linux-3.10-39129eff0f76e66f50ad604c5a68630816acb7ba.zip | |
POWER: fix compile warnings in log_wakeup_reason
Change I81addaf420f1338255c5d0638b0d244a99d777d1 introduced compile
warnings, fix these.
Change-Id: I05482a5335599ab96c0a088a7d175c8d4cf1cf69
Signed-off-by: Ruchi Kandoi <kandoiruchi@google.com>
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/power/wakeup_reason.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/kernel/power/wakeup_reason.c b/kernel/power/wakeup_reason.c index ae9bfece9d9..82e69fe52d0 100644 --- a/kernel/power/wakeup_reason.c +++ b/kernel/power/wakeup_reason.c @@ -35,7 +35,7 @@ static struct kobject *wakeup_reason; static spinlock_t resume_reason_lock; static ssize_t reason_show(struct kobject *kobj, struct kobj_attribute *attr, - const char *buf, size_t count) + char *buf) { int irq_no, buf_offset = 0; struct irq_desc *desc; @@ -106,7 +106,7 @@ static struct notifier_block wakeup_reason_pm_notifier_block = { /* Initializes the sysfs parameter * registers the pm_event notifier */ -void __init wakeup_reason_init(void) +int __init wakeup_reason_init(void) { int retval; spin_lock_init(&resume_reason_lock); @@ -119,7 +119,7 @@ void __init wakeup_reason_init(void) if (!wakeup_reason) { printk(KERN_WARNING "[%s] failed to create a sysfs kobject\n", __func__); - return; + return 1; } retval = sysfs_create_group(wakeup_reason, &attr_group); if (retval) { @@ -127,6 +127,7 @@ void __init wakeup_reason_init(void) printk(KERN_WARNING "[%s] failed to create a sysfs group %d\n", __func__, retval); } + return 0; } late_initcall(wakeup_reason_init); |