aboutsummaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorKay Sievers <kay.sievers@vrfy.org>2009-01-06 10:44:39 -0800
committerGreg Kroah-Hartman <gregkh@suse.de>2009-01-06 10:44:39 -0800
commit81ff86a11f54c9e266c6a6bc3ecd2c9a0f1e11cc (patch)
tree7fb09c281647bb0086014904dfc94f721656ca9d /kernel
parent1d7e6cca1dfd167e5f1e2a7c53119b0c80c90c35 (diff)
downloadkernel_samsung_smdk4412-81ff86a11f54c9e266c6a6bc3ecd2c9a0f1e11cc.zip
kernel_samsung_smdk4412-81ff86a11f54c9e266c6a6bc3ecd2c9a0f1e11cc.tar.gz
kernel_samsung_smdk4412-81ff86a11f54c9e266c6a6bc3ecd2c9a0f1e11cc.tar.bz2
pm: struct device - replace bus_id with dev_name(), dev_set_name()
Signed-off-by: Kay Sievers <kay.sievers@vrfy.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'kernel')
-rw-r--r--kernel/power/main.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/kernel/power/main.c b/kernel/power/main.c
index 613f169..2399888 100644
--- a/kernel/power/main.c
+++ b/kernel/power/main.c
@@ -615,7 +615,7 @@ static void __init test_wakealarm(struct rtc_device *rtc, suspend_state_t state)
/* this may fail if the RTC hasn't been initialized */
status = rtc_read_time(rtc, &alm.time);
if (status < 0) {
- printk(err_readtime, rtc->dev.bus_id, status);
+ printk(err_readtime, dev_name(&rtc->dev), status);
return;
}
rtc_tm_to_time(&alm.time, &now);
@@ -626,7 +626,7 @@ static void __init test_wakealarm(struct rtc_device *rtc, suspend_state_t state)
status = rtc_set_alarm(rtc, &alm);
if (status < 0) {
- printk(err_wakealarm, rtc->dev.bus_id, status);
+ printk(err_wakealarm, dev_name(&rtc->dev), status);
return;
}
@@ -660,7 +660,7 @@ static int __init has_wakealarm(struct device *dev, void *name_ptr)
if (!device_may_wakeup(candidate->dev.parent))
return 0;
- *(char **)name_ptr = dev->bus_id;
+ *(const char **)name_ptr = dev_name(dev);
return 1;
}