mirror of
https://github.com/joel16/android_kernel_sony_msm8994_rework.git
synced 2024-11-23 20:09:51 +00:00
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>
This commit is contained in:
parent
f2fecec51a
commit
744bcb13d3
@ -351,7 +351,7 @@ static int __init at91_rtc_probe(struct platform_device *pdev)
|
||||
/* register irq handler after we know what name we'll use */
|
||||
ret = request_irq(AT91_ID_SYS, at91_rtc_interrupt,
|
||||
IRQF_DISABLED | IRQF_SHARED,
|
||||
rtc->rtcdev->dev.bus_id, rtc);
|
||||
dev_name(&rtc->rtcdev->dev), rtc);
|
||||
if (ret) {
|
||||
dev_dbg(&pdev->dev, "can't share IRQ %d?\n", AT91_ID_SYS);
|
||||
rtc_device_unregister(rtc->rtcdev);
|
||||
@ -366,7 +366,7 @@ static int __init at91_rtc_probe(struct platform_device *pdev)
|
||||
|
||||
if (gpbr_readl(rtc) == 0)
|
||||
dev_warn(&pdev->dev, "%s: SET TIME!\n",
|
||||
rtc->rtcdev->dev.bus_id);
|
||||
dev_name(&rtc->rtcdev->dev));
|
||||
|
||||
return 0;
|
||||
|
||||
|
@ -377,13 +377,13 @@ static int __init omap_rtc_probe(struct platform_device *pdev)
|
||||
|
||||
/* handle periodic and alarm irqs */
|
||||
if (request_irq(omap_rtc_timer, rtc_irq, IRQF_DISABLED,
|
||||
rtc->dev.bus_id, rtc)) {
|
||||
dev_name(&rtc->dev), rtc)) {
|
||||
pr_debug("%s: RTC timer interrupt IRQ%d already claimed\n",
|
||||
pdev->name, omap_rtc_timer);
|
||||
goto fail0;
|
||||
}
|
||||
if (request_irq(omap_rtc_alarm, rtc_irq, IRQF_DISABLED,
|
||||
rtc->dev.bus_id, rtc)) {
|
||||
dev_name(&rtc->dev), rtc)) {
|
||||
pr_debug("%s: RTC alarm interrupt IRQ%d already claimed\n",
|
||||
pdev->name, omap_rtc_alarm);
|
||||
goto fail1;
|
||||
|
@ -426,7 +426,7 @@ static int __devinit twl4030_rtc_probe(struct platform_device *pdev)
|
||||
|
||||
ret = request_irq(irq, twl4030_rtc_interrupt,
|
||||
IRQF_TRIGGER_RISING,
|
||||
rtc->dev.bus_id, rtc);
|
||||
dev_name(&rtc->dev), rtc);
|
||||
if (ret < 0) {
|
||||
dev_err(&pdev->dev, "IRQ is not free.\n");
|
||||
goto out1;
|
||||
|
Loading…
Reference in New Issue
Block a user