aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRuchi Kandoi <kandoiruchi@google.com>2014-02-20 19:47:38 -0800
committerZiyann <jaraidaniel@gmail.com>2014-11-26 21:10:43 +0100
commit7b0892bb4e48442758553898de1fc9a886163266 (patch)
treead29aebf0e38f96ed48fbe3d1eb5e9bed9b34936
parent379b15bea476ac84713fd5b2c9afc0cf04ccff71 (diff)
downloadkernel_samsung_tuna-7b0892bb4e48442758553898de1fc9a886163266.zip
kernel_samsung_tuna-7b0892bb4e48442758553898de1fc9a886163266.tar.gz
kernel_samsung_tuna-7b0892bb4e48442758553898de1fc9a886163266.tar.bz2
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>
-rw-r--r--kernel/power/wakeup_reason.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/kernel/power/wakeup_reason.c b/kernel/power/wakeup_reason.c
index ae9bfec..82e69fe 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);