Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

sh: add the sh_ prefix to early platform symbols

Old early platform device support is now sh-specific. Before moving on
to implementing new early platform framework based on real platform
devices, prefix all early platform symbols with 'sh_'.

Signed-off-by: Bartosz Golaszewski <bgolaszewski@baylibre.com>
Cc: Rich Felker <dalias@libc.org>
Link: https://lore.kernel.org/r/20191003092913.10731-3-brgl@bgdev.pl
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

authored by

Bartosz Golaszewski and committed by
Greg Kroah-Hartman
201e9109 507fd01d

+94 -94
+33 -33
arch/sh/drivers/platform_early.c
··· 4 4 #include <linux/mod_devicetable.h> 5 5 #include <linux/pm.h> 6 6 7 - static __initdata LIST_HEAD(early_platform_driver_list); 8 - static __initdata LIST_HEAD(early_platform_device_list); 7 + static __initdata LIST_HEAD(sh_early_platform_driver_list); 8 + static __initdata LIST_HEAD(sh_early_platform_device_list); 9 9 10 10 static const struct platform_device_id * 11 11 platform_match_id(const struct platform_device_id *id, ··· 58 58 #endif 59 59 60 60 /** 61 - * early_platform_driver_register - register early platform driver 62 - * @epdrv: early_platform driver structure 61 + * sh_early_platform_driver_register - register early platform driver 62 + * @epdrv: sh_early_platform driver structure 63 63 * @buf: string passed from early_param() 64 64 * 65 - * Helper function for early_platform_init() / early_platform_init_buffer() 65 + * Helper function for sh_early_platform_init() / sh_early_platform_init_buffer() 66 66 */ 67 - int __init early_platform_driver_register(struct early_platform_driver *epdrv, 67 + int __init sh_early_platform_driver_register(struct sh_early_platform_driver *epdrv, 68 68 char *buf) 69 69 { 70 70 char *tmp; ··· 75 75 */ 76 76 if (!epdrv->list.next) { 77 77 INIT_LIST_HEAD(&epdrv->list); 78 - list_add_tail(&epdrv->list, &early_platform_driver_list); 78 + list_add_tail(&epdrv->list, &sh_early_platform_driver_list); 79 79 } 80 80 81 81 /* If the user has specified device then make sure the driver ··· 84 84 */ 85 85 n = strlen(epdrv->pdrv->driver.name); 86 86 if (buf && !strncmp(buf, epdrv->pdrv->driver.name, n)) { 87 - list_move(&epdrv->list, &early_platform_driver_list); 87 + list_move(&epdrv->list, &sh_early_platform_driver_list); 88 88 89 89 /* Allow passing parameters after device name */ 90 90 if (buf[n] == '\0' || buf[n] == ',') ··· 114 114 } 115 115 116 116 /** 117 - * early_platform_add_devices - adds a number of early platform devices 117 + * sh_early_platform_add_devices - adds a number of early platform devices 118 118 * @devs: array of early platform devices to add 119 119 * @num: number of early platform devices in array 120 120 * 121 121 * Used by early architecture code to register early platform devices and 122 122 * their platform data. 123 123 */ 124 - void __init early_platform_add_devices(struct platform_device **devs, int num) 124 + void __init sh_early_platform_add_devices(struct platform_device **devs, int num) 125 125 { 126 126 struct device *dev; 127 127 int i; ··· 134 134 pm_runtime_early_init(dev); 135 135 INIT_LIST_HEAD(&dev->devres_head); 136 136 list_add_tail(&dev->devres_head, 137 - &early_platform_device_list); 137 + &sh_early_platform_device_list); 138 138 } 139 139 } 140 140 } 141 141 142 142 /** 143 - * early_platform_driver_register_all - register early platform drivers 143 + * sh_early_platform_driver_register_all - register early platform drivers 144 144 * @class_str: string to identify early platform driver class 145 145 * 146 146 * Used by architecture code to register all early platform drivers 147 147 * for a certain class. If omitted then only early platform drivers 148 148 * with matching kernel command line class parameters will be registered. 149 149 */ 150 - void __init early_platform_driver_register_all(char *class_str) 150 + void __init sh_early_platform_driver_register_all(char *class_str) 151 151 { 152 152 /* The "class_str" parameter may or may not be present on the kernel 153 153 * command line. If it is present then there may be more than one ··· 160 160 * We use parse_early_options() to make sure the early_param() gets 161 161 * called at least once. The early_param() may be called more than 162 162 * once since the name of the preferred device may be specified on 163 - * the kernel command line. early_platform_driver_register() handles 163 + * the kernel command line. sh_early_platform_driver_register() handles 164 164 * this case for us. 165 165 */ 166 166 parse_early_options(class_str); 167 167 } 168 168 169 169 /** 170 - * early_platform_match - find early platform device matching driver 170 + * sh_early_platform_match - find early platform device matching driver 171 171 * @epdrv: early platform driver structure 172 172 * @id: id to match against 173 173 */ 174 174 static struct platform_device * __init 175 - early_platform_match(struct early_platform_driver *epdrv, int id) 175 + sh_early_platform_match(struct sh_early_platform_driver *epdrv, int id) 176 176 { 177 177 struct platform_device *pd; 178 178 179 - list_for_each_entry(pd, &early_platform_device_list, dev.devres_head) 179 + list_for_each_entry(pd, &sh_early_platform_device_list, dev.devres_head) 180 180 if (platform_match(&pd->dev, &epdrv->pdrv->driver)) 181 181 if (pd->id == id) 182 182 return pd; ··· 185 185 } 186 186 187 187 /** 188 - * early_platform_left - check if early platform driver has matching devices 188 + * sh_early_platform_left - check if early platform driver has matching devices 189 189 * @epdrv: early platform driver structure 190 190 * @id: return true if id or above exists 191 191 */ 192 - static int __init early_platform_left(struct early_platform_driver *epdrv, 192 + static int __init sh_early_platform_left(struct sh_early_platform_driver *epdrv, 193 193 int id) 194 194 { 195 195 struct platform_device *pd; 196 196 197 - list_for_each_entry(pd, &early_platform_device_list, dev.devres_head) 197 + list_for_each_entry(pd, &sh_early_platform_device_list, dev.devres_head) 198 198 if (platform_match(&pd->dev, &epdrv->pdrv->driver)) 199 199 if (pd->id >= id) 200 200 return 1; ··· 203 203 } 204 204 205 205 /** 206 - * early_platform_driver_probe_id - probe drivers matching class_str and id 206 + * sh_early_platform_driver_probe_id - probe drivers matching class_str and id 207 207 * @class_str: string to identify early platform driver class 208 208 * @id: id to match against 209 209 * @nr_probe: number of platform devices to successfully probe before exiting 210 210 */ 211 - static int __init early_platform_driver_probe_id(char *class_str, 211 + static int __init sh_early_platform_driver_probe_id(char *class_str, 212 212 int id, 213 213 int nr_probe) 214 214 { 215 - struct early_platform_driver *epdrv; 215 + struct sh_early_platform_driver *epdrv; 216 216 struct platform_device *match; 217 217 int match_id; 218 218 int n = 0; 219 219 int left = 0; 220 220 221 - list_for_each_entry(epdrv, &early_platform_driver_list, list) { 221 + list_for_each_entry(epdrv, &sh_early_platform_driver_list, list) { 222 222 /* only use drivers matching our class_str */ 223 223 if (strcmp(class_str, epdrv->class_str)) 224 224 continue; ··· 229 229 230 230 } else { 231 231 match_id = id; 232 - left += early_platform_left(epdrv, id); 232 + left += sh_early_platform_left(epdrv, id); 233 233 234 234 /* skip requested id */ 235 235 switch (epdrv->requested_id) { ··· 251 251 match = NULL; 252 252 break; 253 253 default: 254 - match = early_platform_match(epdrv, match_id); 254 + match = sh_early_platform_match(epdrv, match_id); 255 255 } 256 256 257 257 if (match) { ··· 293 293 } 294 294 295 295 /** 296 - * early_platform_driver_probe - probe a class of registered drivers 296 + * sh_early_platform_driver_probe - probe a class of registered drivers 297 297 * @class_str: string to identify early platform driver class 298 298 * @nr_probe: number of platform devices to successfully probe before exiting 299 299 * @user_only: only probe user specified early platform devices ··· 302 302 * within a certain class. For probe to happen a registered early platform 303 303 * device matching a registered early platform driver is needed. 304 304 */ 305 - int __init early_platform_driver_probe(char *class_str, 305 + int __init sh_early_platform_driver_probe(char *class_str, 306 306 int nr_probe, 307 307 int user_only) 308 308 { ··· 310 310 311 311 n = 0; 312 312 for (i = -2; n < nr_probe; i++) { 313 - k = early_platform_driver_probe_id(class_str, i, nr_probe - n); 313 + k = sh_early_platform_driver_probe_id(class_str, i, nr_probe - n); 314 314 315 315 if (k < 0) 316 316 break; ··· 325 325 } 326 326 327 327 /** 328 - * early_platform_cleanup - clean up early platform code 328 + * sh_early_platform_cleanup - clean up early platform code 329 329 */ 330 - static int __init early_platform_cleanup(void) 330 + static int __init sh_early_platform_cleanup(void) 331 331 { 332 332 struct platform_device *pd, *pd2; 333 333 334 334 /* clean up the devres list used to chain devices */ 335 - list_for_each_entry_safe(pd, pd2, &early_platform_device_list, 335 + list_for_each_entry_safe(pd, pd2, &sh_early_platform_device_list, 336 336 dev.devres_head) { 337 337 list_del(&pd->dev.devres_head); 338 338 memset(&pd->dev.devres_head, 0, sizeof(pd->dev.devres_head)); ··· 344 344 * This must happen once after all early devices are probed but before probing 345 345 * real platform devices. 346 346 */ 347 - subsys_initcall(early_platform_cleanup); 347 + subsys_initcall(sh_early_platform_cleanup);
+15 -15
arch/sh/include/asm/platform_early.h
··· 8 8 #include <linux/pm_runtime.h> 9 9 #include <linux/slab.h> 10 10 11 - struct early_platform_driver { 11 + struct sh_early_platform_driver { 12 12 const char *class_str; 13 13 struct platform_driver *pdrv; 14 14 struct list_head list; ··· 20 20 #define EARLY_PLATFORM_ID_UNSET -2 21 21 #define EARLY_PLATFORM_ID_ERROR -3 22 22 23 - extern int early_platform_driver_register(struct early_platform_driver *epdrv, 23 + extern int sh_early_platform_driver_register(struct sh_early_platform_driver *epdrv, 24 24 char *buf); 25 - extern void early_platform_add_devices(struct platform_device **devs, int num); 25 + extern void sh_early_platform_add_devices(struct platform_device **devs, int num); 26 26 27 - static inline int is_early_platform_device(struct platform_device *pdev) 27 + static inline int is_sh_early_platform_device(struct platform_device *pdev) 28 28 { 29 29 return !pdev->dev.driver; 30 30 } 31 31 32 - extern void early_platform_driver_register_all(char *class_str); 33 - extern int early_platform_driver_probe(char *class_str, 32 + extern void sh_early_platform_driver_register_all(char *class_str); 33 + extern int sh_early_platform_driver_probe(char *class_str, 34 34 int nr_probe, int user_only); 35 35 36 - #define early_platform_init(class_string, platdrv) \ 37 - early_platform_init_buffer(class_string, platdrv, NULL, 0) 36 + #define sh_early_platform_init(class_string, platdrv) \ 37 + sh_early_platform_init_buffer(class_string, platdrv, NULL, 0) 38 38 39 39 #ifndef MODULE 40 - #define early_platform_init_buffer(class_string, platdrv, buf, bufsiz) \ 41 - static __initdata struct early_platform_driver early_driver = { \ 40 + #define sh_early_platform_init_buffer(class_string, platdrv, buf, bufsiz) \ 41 + static __initdata struct sh_early_platform_driver early_driver = { \ 42 42 .class_str = class_string, \ 43 43 .buffer = buf, \ 44 44 .bufsize = bufsiz, \ 45 45 .pdrv = platdrv, \ 46 46 .requested_id = EARLY_PLATFORM_ID_UNSET, \ 47 47 }; \ 48 - static int __init early_platform_driver_setup_func(char *buffer) \ 48 + static int __init sh_early_platform_driver_setup_func(char *buffer) \ 49 49 { \ 50 - return early_platform_driver_register(&early_driver, buffer); \ 50 + return sh_early_platform_driver_register(&early_driver, buffer); \ 51 51 } \ 52 - early_param(class_string, early_platform_driver_setup_func) 52 + early_param(class_string, sh_early_platform_driver_setup_func) 53 53 #else /* MODULE */ 54 - #define early_platform_init_buffer(class_string, platdrv, buf, bufsiz) \ 55 - static inline char *early_platform_driver_setup_func(void) \ 54 + #define sh_early_platform_init_buffer(class_string, platdrv, buf, bufsiz) \ 55 + static inline char *sh_early_platform_driver_setup_func(void) \ 56 56 { \ 57 57 return bufsiz ? buf : NULL; \ 58 58 }
+1 -1
arch/sh/kernel/cpu/sh2/setup-sh7619.c
··· 200 200 /* enable CMT clock */ 201 201 __raw_writeb(__raw_readb(STBCR3) & ~0x10, STBCR3); 202 202 203 - early_platform_add_devices(sh7619_early_devices, 203 + sh_early_platform_add_devices(sh7619_early_devices, 204 204 ARRAY_SIZE(sh7619_early_devices)); 205 205 }
+1 -1
arch/sh/kernel/cpu/sh2a/setup-mxg.c
··· 170 170 171 171 void __init plat_early_device_setup(void) 172 172 { 173 - early_platform_add_devices(mxg_early_devices, 173 + sh_early_platform_add_devices(mxg_early_devices, 174 174 ARRAY_SIZE(mxg_early_devices)); 175 175 }
+1 -1
arch/sh/kernel/cpu/sh2a/setup-sh7201.c
··· 413 413 /* enable MTU2 clock */ 414 414 __raw_writeb(__raw_readb(STBCR3) & ~0x20, STBCR3); 415 415 416 - early_platform_add_devices(sh7201_early_devices, 416 + sh_early_platform_add_devices(sh7201_early_devices, 417 417 ARRAY_SIZE(sh7201_early_devices)); 418 418 }
+1 -1
arch/sh/kernel/cpu/sh2a/setup-sh7203.c
··· 350 350 /* enable MTU2 clock */ 351 351 __raw_writeb(__raw_readb(STBCR3) & ~0x20, STBCR3); 352 352 353 - early_platform_add_devices(sh7203_early_devices, 353 + sh_early_platform_add_devices(sh7203_early_devices, 354 354 ARRAY_SIZE(sh7203_early_devices)); 355 355 }
+1 -1
arch/sh/kernel/cpu/sh2a/setup-sh7206.c
··· 286 286 /* enable MTU2 clock */ 287 287 __raw_writeb(__raw_readb(STBCR3) & ~0x20, STBCR3); 288 288 289 - early_platform_add_devices(sh7206_early_devices, 289 + sh_early_platform_add_devices(sh7206_early_devices, 290 290 ARRAY_SIZE(sh7206_early_devices)); 291 291 }
+1 -1
arch/sh/kernel/cpu/sh2a/setup-sh7264.c
··· 547 547 548 548 void __init plat_early_device_setup(void) 549 549 { 550 - early_platform_add_devices(sh7264_early_devices, 550 + sh_early_platform_add_devices(sh7264_early_devices, 551 551 ARRAY_SIZE(sh7264_early_devices)); 552 552 }
+1 -1
arch/sh/kernel/cpu/sh2a/setup-sh7269.c
··· 563 563 564 564 void __init plat_early_device_setup(void) 565 565 { 566 - early_platform_add_devices(sh7269_early_devices, 566 + sh_early_platform_add_devices(sh7269_early_devices, 567 567 ARRAY_SIZE(sh7269_early_devices)); 568 568 }
+1 -1
arch/sh/kernel/cpu/sh3/setup-sh7705.c
··· 179 179 180 180 void __init plat_early_device_setup(void) 181 181 { 182 - early_platform_add_devices(sh7705_early_devices, 182 + sh_early_platform_add_devices(sh7705_early_devices, 183 183 ARRAY_SIZE(sh7705_early_devices)); 184 184 } 185 185
+1 -1
arch/sh/kernel/cpu/sh3/setup-sh770x.c
··· 231 231 232 232 void __init plat_early_device_setup(void) 233 233 { 234 - early_platform_add_devices(sh770x_early_devices, 234 + sh_early_platform_add_devices(sh770x_early_devices, 235 235 ARRAY_SIZE(sh770x_early_devices)); 236 236 } 237 237
+1 -1
arch/sh/kernel/cpu/sh3/setup-sh7710.c
··· 178 178 179 179 void __init plat_early_device_setup(void) 180 180 { 181 - early_platform_add_devices(sh7710_early_devices, 181 + sh_early_platform_add_devices(sh7710_early_devices, 182 182 ARRAY_SIZE(sh7710_early_devices)); 183 183 } 184 184
+1 -1
arch/sh/kernel/cpu/sh3/setup-sh7720.c
··· 212 212 213 213 void __init plat_early_device_setup(void) 214 214 { 215 - early_platform_add_devices(sh7720_early_devices, 215 + sh_early_platform_add_devices(sh7720_early_devices, 216 216 ARRAY_SIZE(sh7720_early_devices)); 217 217 } 218 218
+1 -1
arch/sh/kernel/cpu/sh4/setup-sh4-202.c
··· 77 77 78 78 void __init plat_early_device_setup(void) 79 79 { 80 - early_platform_add_devices(sh4202_early_devices, 80 + sh_early_platform_add_devices(sh4202_early_devices, 81 81 ARRAY_SIZE(sh4202_early_devices)); 82 82 } 83 83
+4 -4
arch/sh/kernel/cpu/sh4/setup-sh7750.c
··· 162 162 if (mach_is_rts7751r2d()) { 163 163 scif_platform_data.scscr |= SCSCR_CKE1; 164 164 dev[0] = &scif_device; 165 - early_platform_add_devices(dev, 1); 165 + sh_early_platform_add_devices(dev, 1); 166 166 } else { 167 167 dev[0] = &sci_device; 168 - early_platform_add_devices(dev, 1); 168 + sh_early_platform_add_devices(dev, 1); 169 169 dev[0] = &scif_device; 170 - early_platform_add_devices(dev, 1); 170 + sh_early_platform_add_devices(dev, 1); 171 171 } 172 172 173 - early_platform_add_devices(sh7750_early_devices, 173 + sh_early_platform_add_devices(sh7750_early_devices, 174 174 ARRAY_SIZE(sh7750_early_devices)); 175 175 } 176 176
+1 -1
arch/sh/kernel/cpu/sh4/setup-sh7760.c
··· 272 272 273 273 void __init plat_early_device_setup(void) 274 274 { 275 - early_platform_add_devices(sh7760_early_devices, 275 + sh_early_platform_add_devices(sh7760_early_devices, 276 276 ARRAY_SIZE(sh7760_early_devices)); 277 277 } 278 278
+1 -1
arch/sh/kernel/cpu/sh4a/setup-sh7343.c
··· 297 297 298 298 void __init plat_early_device_setup(void) 299 299 { 300 - early_platform_add_devices(sh7343_early_devices, 300 + sh_early_platform_add_devices(sh7343_early_devices, 301 301 ARRAY_SIZE(sh7343_early_devices)); 302 302 } 303 303
+1 -1
arch/sh/kernel/cpu/sh4a/setup-sh7366.c
··· 241 241 242 242 void __init plat_early_device_setup(void) 243 243 { 244 - early_platform_add_devices(sh7366_early_devices, 244 + sh_early_platform_add_devices(sh7366_early_devices, 245 245 ARRAY_SIZE(sh7366_early_devices)); 246 246 } 247 247
+1 -1
arch/sh/kernel/cpu/sh4a/setup-sh7722.c
··· 513 513 514 514 void __init plat_early_device_setup(void) 515 515 { 516 - early_platform_add_devices(sh7722_early_devices, 516 + sh_early_platform_add_devices(sh7722_early_devices, 517 517 ARRAY_SIZE(sh7722_early_devices)); 518 518 } 519 519
+1 -1
arch/sh/kernel/cpu/sh4a/setup-sh7723.c
··· 411 411 412 412 void __init plat_early_device_setup(void) 413 413 { 414 - early_platform_add_devices(sh7723_early_devices, 414 + sh_early_platform_add_devices(sh7723_early_devices, 415 415 ARRAY_SIZE(sh7723_early_devices)); 416 416 } 417 417
+1 -1
arch/sh/kernel/cpu/sh4a/setup-sh7724.c
··· 831 831 832 832 void __init plat_early_device_setup(void) 833 833 { 834 - early_platform_add_devices(sh7724_early_devices, 834 + sh_early_platform_add_devices(sh7724_early_devices, 835 835 ARRAY_SIZE(sh7724_early_devices)); 836 836 } 837 837
+1 -1
arch/sh/kernel/cpu/sh4a/setup-sh7734.c
··· 281 281 282 282 void __init plat_early_device_setup(void) 283 283 { 284 - early_platform_add_devices(sh7734_early_devices, 284 + sh_early_platform_add_devices(sh7734_early_devices, 285 285 ARRAY_SIZE(sh7734_early_devices)); 286 286 } 287 287
+1 -1
arch/sh/kernel/cpu/sh4a/setup-sh7757.c
··· 768 768 769 769 void __init plat_early_device_setup(void) 770 770 { 771 - early_platform_add_devices(sh7757_early_devices, 771 + sh_early_platform_add_devices(sh7757_early_devices, 772 772 ARRAY_SIZE(sh7757_early_devices)); 773 773 } 774 774
+1 -1
arch/sh/kernel/cpu/sh4a/setup-sh7763.c
··· 222 222 223 223 void __init plat_early_device_setup(void) 224 224 { 225 - early_platform_add_devices(sh7763_early_devices, 225 + sh_early_platform_add_devices(sh7763_early_devices, 226 226 ARRAY_SIZE(sh7763_early_devices)); 227 227 } 228 228
+1 -1
arch/sh/kernel/cpu/sh4a/setup-sh7770.c
··· 317 317 318 318 void __init plat_early_device_setup(void) 319 319 { 320 - early_platform_add_devices(sh7770_early_devices, 320 + sh_early_platform_add_devices(sh7770_early_devices, 321 321 ARRAY_SIZE(sh7770_early_devices)); 322 322 } 323 323
+1 -1
arch/sh/kernel/cpu/sh4a/setup-sh7780.c
··· 286 286 scif1_platform_data.scscr &= ~SCSCR_CKE1; 287 287 } 288 288 289 - early_platform_add_devices(sh7780_early_devices, 289 + sh_early_platform_add_devices(sh7780_early_devices, 290 290 ARRAY_SIZE(sh7780_early_devices)); 291 291 } 292 292
+1 -1
arch/sh/kernel/cpu/sh4a/setup-sh7785.c
··· 354 354 355 355 void __init plat_early_device_setup(void) 356 356 { 357 - early_platform_add_devices(sh7785_early_devices, 357 + sh_early_platform_add_devices(sh7785_early_devices, 358 358 ARRAY_SIZE(sh7785_early_devices)); 359 359 } 360 360
+1 -1
arch/sh/kernel/cpu/sh4a/setup-sh7786.c
··· 835 835 836 836 void __init plat_early_device_setup(void) 837 837 { 838 - early_platform_add_devices(sh7786_early_devices, 838 + sh_early_platform_add_devices(sh7786_early_devices, 839 839 ARRAY_SIZE(sh7786_early_devices)); 840 840 }
+1 -1
arch/sh/kernel/cpu/sh4a/setup-shx3.c
··· 153 153 154 154 void __init plat_early_device_setup(void) 155 155 { 156 - early_platform_add_devices(shx3_early_devices, 156 + sh_early_platform_add_devices(shx3_early_devices, 157 157 ARRAY_SIZE(shx3_early_devices)); 158 158 } 159 159
+1 -1
arch/sh/kernel/cpu/sh5/setup-sh5.c
··· 116 116 117 117 void __init plat_early_device_setup(void) 118 118 { 119 - early_platform_add_devices(sh5_early_devices, 119 + sh_early_platform_add_devices(sh5_early_devices, 120 120 ARRAY_SIZE(sh5_early_devices)); 121 121 }
+1 -1
arch/sh/kernel/setup.c
··· 329 329 sh_mv_setup(); 330 330 331 331 /* Let earlyprintk output early console messages */ 332 - early_platform_driver_probe("earlyprintk", 1, 1); 332 + sh_early_platform_driver_probe("earlyprintk", 1, 1); 333 333 334 334 #ifdef CONFIG_OF_FLATTREE 335 335 #ifdef CONFIG_USE_BUILTIN_DTB
+2 -2
arch/sh/kernel/time.c
··· 31 31 * clocksource and the jiffies clocksource is used transparently 32 32 * instead. No error handling is necessary here. 33 33 */ 34 - early_platform_driver_register_all("earlytimer"); 35 - early_platform_driver_probe("earlytimer", 2, 0); 34 + sh_early_platform_driver_register_all("earlytimer"); 35 + sh_early_platform_driver_probe("earlytimer", 2, 0); 36 36 } 37 37 38 38 void __init time_init(void)
+3 -3
drivers/clocksource/sh_cmt.c
··· 1056 1056 struct sh_cmt_device *cmt = platform_get_drvdata(pdev); 1057 1057 int ret; 1058 1058 1059 - if (!is_early_platform_device(pdev)) { 1059 + if (!is_sh_early_platform_device(pdev)) { 1060 1060 pm_runtime_set_active(&pdev->dev); 1061 1061 pm_runtime_enable(&pdev->dev); 1062 1062 } ··· 1076 1076 pm_runtime_idle(&pdev->dev); 1077 1077 return ret; 1078 1078 } 1079 - if (is_early_platform_device(pdev)) 1079 + if (is_sh_early_platform_device(pdev)) 1080 1080 return 0; 1081 1081 1082 1082 out: ··· 1114 1114 } 1115 1115 1116 1116 #ifdef CONFIG_SUPERH 1117 - early_platform_init("earlytimer", &sh_cmt_device_driver); 1117 + sh_early_platform_init("earlytimer", &sh_cmt_device_driver); 1118 1118 #endif 1119 1119 1120 1120 subsys_initcall(sh_cmt_init);
+3 -3
drivers/clocksource/sh_mtu2.c
··· 446 446 struct sh_mtu2_device *mtu = platform_get_drvdata(pdev); 447 447 int ret; 448 448 449 - if (!is_early_platform_device(pdev)) { 449 + if (!is_sh_early_platform_device(pdev)) { 450 450 pm_runtime_set_active(&pdev->dev); 451 451 pm_runtime_enable(&pdev->dev); 452 452 } ··· 466 466 pm_runtime_idle(&pdev->dev); 467 467 return ret; 468 468 } 469 - if (is_early_platform_device(pdev)) 469 + if (is_sh_early_platform_device(pdev)) 470 470 return 0; 471 471 472 472 out: ··· 516 516 } 517 517 518 518 #ifdef CONFIG_SUPERH 519 - early_platform_init("earlytimer", &sh_mtu2_device_driver); 519 + sh_early_platform_init("earlytimer", &sh_mtu2_device_driver); 520 520 #endif 521 521 522 522 subsys_initcall(sh_mtu2_init);
+3 -3
drivers/clocksource/sh_tmu.c
··· 599 599 struct sh_tmu_device *tmu = platform_get_drvdata(pdev); 600 600 int ret; 601 601 602 - if (!is_early_platform_device(pdev)) { 602 + if (!is_sh_early_platform_device(pdev)) { 603 603 pm_runtime_set_active(&pdev->dev); 604 604 pm_runtime_enable(&pdev->dev); 605 605 } ··· 620 620 return ret; 621 621 } 622 622 623 - if (is_early_platform_device(pdev)) 623 + if (is_sh_early_platform_device(pdev)) 624 624 return 0; 625 625 626 626 out: ··· 671 671 } 672 672 673 673 #ifdef CONFIG_SUPERH 674 - early_platform_init("earlytimer", &sh_tmu_device_driver); 674 + sh_early_platform_init("earlytimer", &sh_tmu_device_driver); 675 675 #endif 676 676 677 677 subsys_initcall(sh_tmu_init);
+2 -2
drivers/tty/serial/sh-sci.c
··· 3318 3318 * to make it beyond this yet. 3319 3319 */ 3320 3320 #ifdef CONFIG_SUPERH 3321 - if (is_early_platform_device(dev)) 3321 + if (is_sh_early_platform_device(dev)) 3322 3322 return sci_probe_earlyprintk(dev); 3323 3323 #endif 3324 3324 ··· 3416 3416 } 3417 3417 3418 3418 #if defined(CONFIG_SUPERH) && defined(CONFIG_SERIAL_SH_SCI_CONSOLE) 3419 - early_platform_init_buffer("earlyprintk", &sci_driver, 3419 + sh_early_platform_init_buffer("earlyprintk", &sci_driver, 3420 3420 early_serial_buf, ARRAY_SIZE(early_serial_buf)); 3421 3421 #endif 3422 3422 #ifdef CONFIG_SERIAL_SH_SCI_EARLYCON
+1 -1
include/linux/platform_device.h
··· 332 332 * drivers. It should go away once we introduce the new platform_device-based 333 333 * early driver framework. 334 334 */ 335 - static inline int is_early_platform_device(struct platform_device *pdev) 335 + static inline int is_sh_early_platform_device(struct platform_device *pdev) 336 336 { 337 337 return 0; 338 338 }