1 files changed, 5 insertions, 5 deletions

diff --git a/drivers/rtc/rtc-cmos.c b/drivers/rtc/rtc-cmos.c
index 6cf8e282338f..d37bb86db5d0 100644
--- a/drivers/rtc/rtc-cmos.c
+++ b/drivers/rtc/rtc-cmos.c
@@ -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;