Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit d4afc76c0b59a37113e184004f8a9989cfc1ddd3

Authored by Kay Sievers
Committed by Linus Torvalds
1 parent 103d6d9170
Exists in master and in 39 other branches 8mp-imx_5.4.70_2.3.0, 8qm-imx_5.4.70_2.3.0, emb_imx_lf-5.15.y, emb_lf-6.1.y, imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, imx_4.1.15_1.0.0_ga, pitx_8mp_lf-5.10.y, rt-smarc-imx_4.1.15_1.0.0_ga, rt_linux_5.15.71, smarc-8m-android-11.0.0_2.0.0, smarc-imx6_4.14.98_2.0.0_ga, smarc-imx6_4.9.88_2.0.0_ga, smarc-imx7_4.14.98_2.0.0_ga, smarc-imx7_4.9.11_1.0.0_ga, smarc-imx7_4.9.88_2.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-imx_4.1.15_1.0.0_ga, smarc-imx_4.9.11_1.0.0_ga, smarc-imx_4.9.51_imx8m_ga, smarc-imx_4.9.88_2.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_1.2.0_ga, smarc_8m_00d0_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.14.78_1.0.0_ga, smarc_8m_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.19.35_1.1.0, smarc_8mm_imx_4.14.78_1.0.0_ga, smarc_8mm_imx_4.14.98_2.0.0_ga, smarc_8mm_imx_4.19.35_1.1.0, smarc_8mm_imx_5.4.24_2.1.0, smarc_8mp_lf-5.10.y, smarc_8mq_imx_5.4.24_2.1.0, smarc_8mq_lf-5.10.y, smarc_imx_lf-5.15.y

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

Acked-by: Alessandro Zummo <a.zummo@towertech.it>
Acked-By: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Kay Sievers <kay.sievers@vrfy.org>
Cc: David Brownell <david-b@pacbell.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

Showing 3 changed files with 12 additions and 16 deletions Side-by-side Diff

... ... @@ -48,9 +48,7 @@
48 48 struct rtc_time tm;
49 49 struct timespec ts = current_kernel_time();
50 50  
51   - if (strncmp(rtc->dev.bus_id,
52   - CONFIG_RTC_HCTOSYS_DEVICE,
53   - BUS_ID_SIZE) != 0)
  51 + if (strcmp(dev_name(&rtc->dev), CONFIG_RTC_HCTOSYS_DEVICE) != 0)
54 52 return 0;
55 53  
56 54 rtc_read_time(rtc, &tm);
57 55  
58 56  
... ... @@ -71,20 +69,18 @@
71 69 time_t newtime;
72 70 struct timespec time;
73 71  
74   - if (strncmp(rtc->dev.bus_id,
75   - CONFIG_RTC_HCTOSYS_DEVICE,
76   - BUS_ID_SIZE) != 0)
  72 + if (strcmp(dev_name(&rtc->dev), CONFIG_RTC_HCTOSYS_DEVICE) != 0)
77 73 return 0;
78 74  
79 75 rtc_read_time(rtc, &tm);
80 76 if (rtc_valid_tm(&tm) != 0) {
81   - pr_debug("%s: bogus resume time\n", rtc->dev.bus_id);
  77 + pr_debug("%s: bogus resume time\n", dev_name(&rtc->dev));
82 78 return 0;
83 79 }
84 80 rtc_tm_to_time(&tm, &newtime);
85 81 if (newtime <= oldtime) {
86 82 if (newtime < oldtime)
87   - pr_debug("%s: time travel!\n", rtc->dev.bus_id);
  83 + pr_debug("%s: time travel!\n", dev_name(&rtc->dev));
88 84 return 0;
89 85 }
90 86  
... ... @@ -156,7 +152,7 @@
156 152 init_waitqueue_head(&rtc->irq_queue);
157 153  
158 154 strlcpy(rtc->name, name, RTC_DEVICE_NAME_SIZE);
159   - snprintf(rtc->dev.bus_id, BUS_ID_SIZE, "rtc%d", id);
  155 + dev_set_name(&rtc->dev, "rtc%d", id);
160 156  
161 157 rtc_dev_prepare(rtc);
162 158  
... ... @@ -169,7 +165,7 @@
169 165 rtc_proc_add_device(rtc);
170 166  
171 167 dev_info(dev, "rtc core: registered %s as %s\n",
172   - rtc->name, rtc->dev.bus_id);
  168 + rtc->name, dev_name(&rtc->dev));
173 169  
174 170 return rtc;
175 171  
drivers/rtc/interface.c
Diff comments   View file @ d4afc76
... ... @@ -389,7 +389,7 @@
389 389 {
390 390 char *name = (char *)data;
391 391  
392   - if (strncmp(dev->bus_id, name, BUS_ID_SIZE) == 0)
  392 + if (strcmp(dev_name(dev), name) == 0)
393 393 return 1;
394 394 return 0;
395 395 }
drivers/rtc/rtc-cmos.c
Diff comments   View file @ d4afc76
... ... @@ -729,7 +729,7 @@
729 729  
730 730 cmos_rtc.dev = dev;
731 731 dev_set_drvdata(dev, &cmos_rtc);
732   - rename_region(ports, cmos_rtc.rtc->dev.bus_id);
  732 + rename_region(ports, dev_name(&cmos_rtc.rtc->dev));
733 733  
734 734 spin_lock_irq(&rtc_lock);
735 735  
... ... @@ -777,7 +777,7 @@
777 777 rtc_cmos_int_handler = cmos_interrupt;
778 778  
779 779 retval = request_irq(rtc_irq, rtc_cmos_int_handler,
780   - IRQF_DISABLED, cmos_rtc.rtc->dev.bus_id,
  780 + IRQF_DISABLED, dev_name(&cmos_rtc.rtc->dev),
781 781 cmos_rtc.rtc);
782 782 if (retval < 0) {
783 783 dev_dbg(dev, "IRQ %d is already in use\n", rtc_irq);
... ... @@ -795,7 +795,7 @@
795 795 }
796 796  
797 797 pr_info("%s: alarms up to one %s%s, %zd bytes nvram%s\n",
798   - cmos_rtc.rtc->dev.bus_id,
  798 + dev_name(&cmos_rtc.rtc->dev),
799 799 is_valid_irq(rtc_irq)
800 800 ? (cmos_rtc.mon_alrm
801 801 ? "year"
... ... @@ -885,7 +885,7 @@
885 885 }
886 886  
887 887 pr_debug("%s: suspend%s, ctrl %02x\n",
888   - cmos_rtc.rtc->dev.bus_id,
  888 + dev_name(&cmos_rtc.rtc->dev),
889 889 (tmp & RTC_AIE) ? ", alarm may wake" : "",
890 890 tmp);
891 891  
... ... @@ -941,7 +941,7 @@
941 941 }
942 942  
943 943 pr_debug("%s: resume, ctrl %02x\n",
944   - cmos_rtc.rtc->dev.bus_id,
  944 + dev_name(&cmos_rtc.rtc->dev),
945 945 tmp);
946 946  
947 947 return 0;