Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d4afc76c authored by Kay Sievers's avatar Kay Sievers Committed by Linus Torvalds
Browse files

rtc: struct device: replace bus_id with dev_name(), dev_set_name() 



Acked-by: default avatarAlessandro Zummo <a.zummo@towertech.it>
Acked-By: default avatarGreg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: default avatarKay Sievers <kay.sievers@vrfy.org>
Cc: David Brownell <david-b@pacbell.net>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 103d6d91

drivers/rtc/class.c

+6 −10
Original line number Diff line number Diff line
@@ -48,9 +48,7 @@ static int rtc_suspend(struct device *dev, pm_message_t mesg) 
	struct rtc_time		tm;

	struct timespec		ts = current_kernel_time();



	if (strncmp(rtc->dev.bus_id,

				CONFIG_RTC_HCTOSYS_DEVICE,

				BUS_ID_SIZE) != 0)

	if (strcmp(dev_name(&rtc->dev), CONFIG_RTC_HCTOSYS_DEVICE) != 0)

		return 0;



	rtc_read_time(rtc, &tm);
@@ -71,20 +69,18 @@ static int rtc_resume(struct device *dev) 
	time_t			newtime;

	struct timespec		time;



	if (strncmp(rtc->dev.bus_id,

				CONFIG_RTC_HCTOSYS_DEVICE,

				BUS_ID_SIZE) != 0)

	if (strcmp(dev_name(&rtc->dev), CONFIG_RTC_HCTOSYS_DEVICE) != 0)

		return 0;



	rtc_read_time(rtc, &tm);

	if (rtc_valid_tm(&tm) != 0) {

		pr_debug("%s:  bogus resume time\n", rtc->dev.bus_id);

		pr_debug("%s:  bogus resume time\n", dev_name(&rtc->dev));

		return 0;

	}

	rtc_tm_to_time(&tm, &newtime);

	if (newtime <= oldtime) {

		if (newtime < oldtime)

			pr_debug("%s:  time travel!\n", rtc->dev.bus_id);

			pr_debug("%s:  time travel!\n", dev_name(&rtc->dev));

		return 0;

	}
@@ -156,7 +152,7 @@ struct rtc_device *rtc_device_register(const char *name, struct device *dev, 
	init_waitqueue_head(&rtc->irq_queue);



	strlcpy(rtc->name, name, RTC_DEVICE_NAME_SIZE);

	snprintf(rtc->dev.bus_id, BUS_ID_SIZE, "rtc%d", id);

	dev_set_name(&rtc->dev, "rtc%d", id);



	rtc_dev_prepare(rtc);
@@ -169,7 +165,7 @@ struct rtc_device *rtc_device_register(const char *name, struct device *dev, 
	rtc_proc_add_device(rtc);



	dev_info(dev, "rtc core: registered %s as %s\n",

			rtc->name, rtc->dev.bus_id);

			rtc->name, dev_name(&rtc->dev));



	return rtc;

drivers/rtc/interface.c

+1 −1
Original line number Diff line number Diff line
@@ -389,7 +389,7 @@ static int __rtc_match(struct device *dev, void *data) 
{

	char *name = (char *)data;



	if (strncmp(dev->bus_id, name, BUS_ID_SIZE) == 0)

	if (strcmp(dev_name(dev), name) == 0)

		return 1;

	return 0;

}

drivers/rtc/rtc-cmos.c

+5 −5
Original line number Diff line number Diff line
@@ -729,7 +729,7 @@ cmos_do_probe(struct device *dev, struct resource *ports, int rtc_irq) 


	cmos_rtc.dev = dev;

	dev_set_drvdata(dev, &cmos_rtc);

	rename_region(ports, cmos_rtc.rtc->dev.bus_id);

	rename_region(ports, dev_name(&cmos_rtc.rtc->dev));



	spin_lock_irq(&rtc_lock);
@@ -777,7 +777,7 @@ cmos_do_probe(struct device *dev, struct resource *ports, int rtc_irq) 
			rtc_cmos_int_handler = cmos_interrupt;



		retval = request_irq(rtc_irq, rtc_cmos_int_handler,

				IRQF_DISABLED, cmos_rtc.rtc->dev.bus_id,

				IRQF_DISABLED, dev_name(&cmos_rtc.rtc->dev),

				cmos_rtc.rtc);

		if (retval < 0) {

			dev_dbg(dev, "IRQ %d is already in use\n", rtc_irq);
@@ -795,7 +795,7 @@ cmos_do_probe(struct device *dev, struct resource *ports, int rtc_irq) 
	}



	pr_info("%s: alarms up to one %s%s, %zd bytes nvram%s\n",

			cmos_rtc.rtc->dev.bus_id,

			dev_name(&cmos_rtc.rtc->dev),

			is_valid_irq(rtc_irq)

				?  (cmos_rtc.mon_alrm

					? "year"
@@ -885,7 +885,7 @@ static int cmos_suspend(struct device *dev, pm_message_t mesg) 
	}



	pr_debug("%s: suspend%s, ctrl %02x\n",

			cmos_rtc.rtc->dev.bus_id,

			dev_name(&cmos_rtc.rtc->dev),

			(tmp & RTC_AIE) ? ", alarm may wake" : "",

			tmp);
@@ -941,7 +941,7 @@ static int cmos_resume(struct device *dev) 
	}



	pr_debug("%s: resume, ctrl %02x\n",

			cmos_rtc.rtc->dev.bus_id,

			dev_name(&cmos_rtc.rtc->dev),

			tmp);



	return 0;