pm: struct device - replace bus_id with dev_name(), dev_set_name() (81ff86a1) · Commits · 戴 / test

kernel/power/main.c

+3 −3

Original line number	Diff line number	Diff line
		@@ -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;
		}