Commit 744bcb13d376b38ff1df3bbcc810493e1b999502
Committed by
Greg Kroah-Hartman
1 parent
f2fecec51a
Exists in
master
and in
7 other branches
rtc: struct device - replace bus_id with dev_name(), dev_set_name()
Cc: a.zummo@towertech.it Cc: rtc-linux@googlegroups.com Signed-off-by: Kay Sievers <kay.sievers@vrfy.org> Signed-off-by: Alessandro Zummo <a.zummo@towertech.it> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Showing 3 changed files with 5 additions and 5 deletions Side-by-side Diff
drivers/rtc/rtc-at91sam9.c
... | ... | @@ -351,7 +351,7 @@ |
351 | 351 | /* register irq handler after we know what name we'll use */ |
352 | 352 | ret = request_irq(AT91_ID_SYS, at91_rtc_interrupt, |
353 | 353 | IRQF_DISABLED | IRQF_SHARED, |
354 | - rtc->rtcdev->dev.bus_id, rtc); | |
354 | + dev_name(&rtc->rtcdev->dev), rtc); | |
355 | 355 | if (ret) { |
356 | 356 | dev_dbg(&pdev->dev, "can't share IRQ %d?\n", AT91_ID_SYS); |
357 | 357 | rtc_device_unregister(rtc->rtcdev); |
... | ... | @@ -366,7 +366,7 @@ |
366 | 366 | |
367 | 367 | if (gpbr_readl(rtc) == 0) |
368 | 368 | dev_warn(&pdev->dev, "%s: SET TIME!\n", |
369 | - rtc->rtcdev->dev.bus_id); | |
369 | + dev_name(&rtc->rtcdev->dev)); | |
370 | 370 | |
371 | 371 | return 0; |
372 | 372 |
drivers/rtc/rtc-omap.c
... | ... | @@ -377,13 +377,13 @@ |
377 | 377 | |
378 | 378 | /* handle periodic and alarm irqs */ |
379 | 379 | if (request_irq(omap_rtc_timer, rtc_irq, IRQF_DISABLED, |
380 | - rtc->dev.bus_id, rtc)) { | |
380 | + dev_name(&rtc->dev), rtc)) { | |
381 | 381 | pr_debug("%s: RTC timer interrupt IRQ%d already claimed\n", |
382 | 382 | pdev->name, omap_rtc_timer); |
383 | 383 | goto fail0; |
384 | 384 | } |
385 | 385 | if (request_irq(omap_rtc_alarm, rtc_irq, IRQF_DISABLED, |
386 | - rtc->dev.bus_id, rtc)) { | |
386 | + dev_name(&rtc->dev), rtc)) { | |
387 | 387 | pr_debug("%s: RTC alarm interrupt IRQ%d already claimed\n", |
388 | 388 | pdev->name, omap_rtc_alarm); |
389 | 389 | goto fail1; |
drivers/rtc/rtc-twl4030.c