Eric Lee / linux-smarc-t335x-v3.2

Download as
Browse Code ยป

Commit 1ab1d63a85cee2545272f63a7644e9f855cb65d0

Authored by Grant Likely
1 parent eca3930163
Exists in master and in 4 other branches v3.2_AM335xPSP_04.06.00.11, v3.2_NEWT335xPSP_04.06.00.11, v3.2_SBC_SMARTMEN, v3.2_SMARCT335xPSP_04.06.00.11

of/platform: remove all of_bus_type and of_platform_bus_type references 

Both of_bus_type and of_platform_bus_type are just #define aliases
for the platform bus.  This patch removes all references to them and
switches to the of_register_platform_driver()/of_unregister_platform_driver()
API for registering.

Subsequent patches will convert each user of of_register_platform_driver()
into plain platform_drivers without the of_platform_driver shim.  At which
point the of_register_platform_driver()/of_unregister_platform_driver()
functions can be removed.

Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
Acked-by: David S. Miller <davem@davemloft.net>

Showing 59 changed files with 109 additions and 124 deletions Side-by-side Diff

arch/microblaze/kernel/of_platform.c
Diff comments   View file @ 1ab1d63
... ... @@ -57,8 +57,7 @@
57 57 {
58 58 struct device *dev;
59 59  
60   - dev = bus_find_device(&of_platform_bus_type,
61   - NULL, np, of_dev_node_match);
  60 + dev = bus_find_device(&platform_bus_type, NULL, np, of_dev_node_match);
62 61 if (dev)
63 62 return to_of_device(dev);
64 63 return NULL;
arch/powerpc/kernel/of_platform.c
Diff comments   View file @ 1ab1d63
... ... @@ -61,8 +61,7 @@
61 61 {
62 62 struct device *dev;
63 63  
64   - dev = bus_find_device(&of_platform_bus_type,
65   - NULL, np, of_dev_node_match);
  64 + dev = bus_find_device(&platform_bus_type, NULL, np, of_dev_node_match);
66 65 if (dev)
67 66 return to_of_device(dev);
68 67 return NULL;
arch/sparc/include/asm/of_platform.h
Diff comments   View file @ 1ab1d63
... ... @@ -13,7 +13,5 @@
13 13 *
14 14 */
15 15  
16   -#define of_bus_type of_platform_bus_type /* for compatibility */
17   -
18 16 #endif
arch/sparc/include/asm/parport.h
Diff comments   View file @ 1ab1d63
... ... @@ -243,9 +243,7 @@
243 243  
244 244 static int parport_pc_find_nonpci_ports(int autoirq, int autodma)
245 245 {
246   - of_register_driver(&ecpp_driver, &of_bus_type);
247   -
248   - return 0;
  246 + return of_register_platform_driver(&ecpp_driver);
249 247 }
250 248  
251 249 #endif /* !(_ASM_SPARC64_PARPORT_H */
arch/sparc/kernel/apc.c
Diff comments   View file @ 1ab1d63
... ... @@ -184,7 +184,7 @@
184 184  
185 185 static int __init apc_init(void)
186 186 {
187   - return of_register_driver(&apc_driver, &of_bus_type);
  187 + return of_register_platform_driver(&apc_driver);
188 188 }
189 189  
190 190 /* This driver is not critical to the boot process
arch/sparc/kernel/auxio_64.c
Diff comments   View file @ 1ab1d63
... ... @@ -142,7 +142,7 @@
142 142  
143 143 static int __init auxio_init(void)
144 144 {
145   - return of_register_driver(&auxio_driver, &of_platform_bus_type);
  145 + return of_register_platform_driver(&auxio_driver);
146 146 }
147 147  
148 148 /* Must be after subsys_initcall() so that busses are probed. Must
arch/sparc/kernel/central.c
Diff comments   View file @ 1ab1d63
... ... @@ -265,8 +265,8 @@
265 265  
266 266 static int __init sunfire_init(void)
267 267 {
268   - (void) of_register_driver(&fhc_driver, &of_platform_bus_type);
269   - (void) of_register_driver(&clock_board_driver, &of_platform_bus_type);
  268 + (void) of_register_platform_driver(&fhc_driver);
  269 + (void) of_register_platform_driver(&clock_board_driver);
270 270 return 0;
271 271 }
272 272  
arch/sparc/kernel/chmc.c
Diff comments   View file @ 1ab1d63
... ... @@ -848,7 +848,7 @@
848 848 ret = register_dimm_printer(us3mc_dimm_printer);
849 849  
850 850 if (!ret) {
851   - ret = of_register_driver(&us3mc_driver, &of_bus_type);
  851 + ret = of_register_platform_driver(&us3mc_driver);
852 852 if (ret)
853 853 unregister_dimm_printer(us3mc_dimm_printer);
854 854 }
... ... @@ -859,7 +859,7 @@
859 859 {
860 860 if (us3mc_platform()) {
861 861 unregister_dimm_printer(us3mc_dimm_printer);
862   - of_unregister_driver(&us3mc_driver);
  862 + of_unregister_platform_driver(&us3mc_driver);
863 863 }
864 864 }
865 865  
arch/sparc/kernel/of_device_common.c
Diff comments   View file @ 1ab1d63
... ... @@ -21,7 +21,7 @@
21 21  
22 22 struct of_device *of_find_device_by_node(struct device_node *dp)
23 23 {
24   - struct device *dev = bus_find_device(&of_platform_bus_type, NULL,
  24 + struct device *dev = bus_find_device(&platform_bus_type, NULL,
25 25 dp, node_match);
26 26  
27 27 if (dev)
arch/sparc/kernel/pci_fire.c
Diff comments   View file @ 1ab1d63
... ... @@ -518,7 +518,7 @@
518 518  
519 519 static int __init fire_init(void)
520 520 {
521   - return of_register_driver(&fire_driver, &of_bus_type);
  521 + return of_register_platform_driver(&fire_driver);
522 522 }
523 523  
524 524 subsys_initcall(fire_init);
arch/sparc/kernel/pci_psycho.c
Diff comments   View file @ 1ab1d63
... ... @@ -612,7 +612,7 @@
612 612  
613 613 static int __init psycho_init(void)
614 614 {
615   - return of_register_driver(&psycho_driver, &of_bus_type);
  615 + return of_register_platform_driver(&psycho_driver);
616 616 }
617 617  
618 618 subsys_initcall(psycho_init);
arch/sparc/kernel/pci_sabre.c
Diff comments   View file @ 1ab1d63
... ... @@ -606,7 +606,7 @@
606 606  
607 607 static int __init sabre_init(void)
608 608 {
609   - return of_register_driver(&sabre_driver, &of_bus_type);
  609 + return of_register_platform_driver(&sabre_driver);
610 610 }
611 611  
612 612 subsys_initcall(sabre_init);
arch/sparc/kernel/pci_schizo.c
Diff comments   View file @ 1ab1d63
... ... @@ -1501,7 +1501,7 @@
1501 1501  
1502 1502 static int __init schizo_init(void)
1503 1503 {
1504   - return of_register_driver(&schizo_driver, &of_bus_type);
  1504 + return of_register_platform_driver(&schizo_driver);
1505 1505 }
1506 1506  
1507 1507 subsys_initcall(schizo_init);
arch/sparc/kernel/pci_sun4v.c
Diff comments   View file @ 1ab1d63
... ... @@ -1019,7 +1019,7 @@
1019 1019  
1020 1020 static int __init pci_sun4v_init(void)
1021 1021 {
1022   - return of_register_driver(&pci_sun4v_driver, &of_bus_type);
  1022 + return of_register_platform_driver(&pci_sun4v_driver);
1023 1023 }
1024 1024  
1025 1025 subsys_initcall(pci_sun4v_init);
arch/sparc/kernel/pmc.c
Diff comments   View file @ 1ab1d63
... ... @@ -89,7 +89,7 @@
89 89  
90 90 static int __init pmc_init(void)
91 91 {
92   - return of_register_driver(&pmc_driver, &of_bus_type);
  92 + return of_register_platform_driver(&pmc_driver);
93 93 }
94 94  
95 95 /* This driver is not critical to the boot process
arch/sparc/kernel/power.c
Diff comments   View file @ 1ab1d63
... ... @@ -70,7 +70,7 @@
70 70  
71 71 static int __init power_init(void)
72 72 {
73   - return of_register_driver(&power_driver, &of_platform_bus_type);
  73 + return of_register_platform_driver(&power_driver);
74 74 }
75 75  
76 76 device_initcall(power_init);
arch/sparc/kernel/time_32.c
Diff comments   View file @ 1ab1d63
... ... @@ -189,7 +189,7 @@
189 189 /* Probe for the mostek real time clock chip. */
190 190 static int __init clock_init(void)
191 191 {
192   - return of_register_driver(&clock_driver, &of_platform_bus_type);
  192 + return of_register_platform_driver(&clock_driver);
193 193 }
194 194 /* Must be after subsys_initcall() so that busses are probed. Must
195 195 * be before device_initcall() because things like the RTC driver
arch/sparc/kernel/time_64.c
Diff comments   View file @ 1ab1d63
... ... @@ -586,9 +586,9 @@
586 586 if (tlb_type == hypervisor)
587 587 return platform_device_register(&rtc_sun4v_device);
588 588  
589   - (void) of_register_driver(&rtc_driver, &of_platform_bus_type);
590   - (void) of_register_driver(&mostek_driver, &of_platform_bus_type);
591   - (void) of_register_driver(&bq4802_driver, &of_platform_bus_type);
  589 + (void) of_register_platform_driver(&rtc_driver);
  590 + (void) of_register_platform_driver(&mostek_driver);
  591 + (void) of_register_platform_driver(&bq4802_driver);
592 592  
593 593 return 0;
594 594 }
drivers/atm/fore200e.c
Diff comments   View file @ 1ab1d63
... ... @@ -2795,7 +2795,7 @@
2795 2795 printk(FORE200E "FORE Systems 200E-series ATM driver - version " FORE200E_VERSION "\n");
2796 2796  
2797 2797 #ifdef CONFIG_SBUS
2798   - err = of_register_driver(&fore200e_sba_driver, &of_bus_type);
  2798 + err = of_register_platform_driver(&fore200e_sba_driver);
2799 2799 if (err)
2800 2800 return err;
2801 2801 #endif
... ... @@ -2806,7 +2806,7 @@
2806 2806  
2807 2807 #ifdef CONFIG_SBUS
2808 2808 if (err)
2809   - of_unregister_driver(&fore200e_sba_driver);
  2809 + of_unregister_platform_driver(&fore200e_sba_driver);
2810 2810 #endif
2811 2811  
2812 2812 return err;
... ... @@ -2818,7 +2818,7 @@
2818 2818 pci_unregister_driver(&fore200e_pca_driver);
2819 2819 #endif
2820 2820 #ifdef CONFIG_SBUS
2821   - of_unregister_driver(&fore200e_sba_driver);
  2821 + of_unregister_platform_driver(&fore200e_sba_driver);
2822 2822 #endif
2823 2823 }
2824 2824  
drivers/char/hw_random/n2-drv.c
Diff comments   View file @ 1ab1d63
... ... @@ -762,12 +762,12 @@
762 762  
763 763 static int __init n2rng_init(void)
764 764 {
765   - return of_register_driver(&n2rng_driver, &of_bus_type);
  765 + return of_register_platform_driver(&n2rng_driver);
766 766 }
767 767  
768 768 static void __exit n2rng_exit(void)
769 769 {
770   - of_unregister_driver(&n2rng_driver);
  770 + of_unregister_platform_driver(&n2rng_driver);
771 771 }
772 772  
773 773 module_init(n2rng_init);
drivers/crypto/n2_core.c
Diff comments   View file @ 1ab1d63
... ... @@ -2070,20 +2070,20 @@
2070 2070  
2071 2071 static int __init n2_init(void)
2072 2072 {
2073   - int err = of_register_driver(&n2_crypto_driver, &of_bus_type);
  2073 + int err = of_register_platform_driver(&n2_crypto_driver);
2074 2074  
2075 2075 if (!err) {
2076   - err = of_register_driver(&n2_mau_driver, &of_bus_type);
  2076 + err = of_register_platform_driver(&n2_mau_driver);
2077 2077 if (err)
2078   - of_unregister_driver(&n2_crypto_driver);
  2078 + of_unregister_platform_driver(&n2_crypto_driver);
2079 2079 }
2080 2080 return err;
2081 2081 }
2082 2082  
2083 2083 static void __exit n2_exit(void)
2084 2084 {
2085   - of_unregister_driver(&n2_mau_driver);
2086   - of_unregister_driver(&n2_crypto_driver);
  2085 + of_unregister_platform_driver(&n2_mau_driver);
  2086 + of_unregister_platform_driver(&n2_crypto_driver);
2087 2087 }
2088 2088  
2089 2089 module_init(n2_init);
drivers/hwmon/ultra45_env.c
Diff comments   View file @ 1ab1d63
... ... @@ -311,12 +311,12 @@
311 311  
312 312 static int __init env_init(void)
313 313 {
314   - return of_register_driver(&env_driver, &of_bus_type);
  314 + return of_register_platform_driver(&env_driver);
315 315 }
316 316  
317 317 static void __exit env_exit(void)
318 318 {
319   - of_unregister_driver(&env_driver);
  319 + of_unregister_platform_driver(&env_driver);
320 320 }
321 321  
322 322 module_init(env_init);
drivers/input/misc/sparcspkr.c
Diff comments   View file @ 1ab1d63
... ... @@ -353,14 +353,12 @@
353 353  
354 354 static int __init sparcspkr_init(void)
355 355 {
356   - int err = of_register_driver(&bbc_beep_driver,
357   - &of_platform_bus_type);
  356 + int err = of_register_platform_driver(&bbc_beep_driver);
358 357  
359 358 if (!err) {
360   - err = of_register_driver(&grover_beep_driver,
361   - &of_platform_bus_type);
  359 + err = of_register_platform_driver(&grover_beep_driver);
362 360 if (err)
363   - of_unregister_driver(&bbc_beep_driver);
  361 + of_unregister_platform_driver(&bbc_beep_driver);
364 362 }
365 363  
366 364 return err;
... ... @@ -368,8 +366,8 @@
368 366  
369 367 static void __exit sparcspkr_exit(void)
370 368 {
371   - of_unregister_driver(&bbc_beep_driver);
372   - of_unregister_driver(&grover_beep_driver);
  369 + of_unregister_platform_driver(&bbc_beep_driver);
  370 + of_unregister_platform_driver(&grover_beep_driver);
373 371 }
374 372  
375 373 module_init(sparcspkr_init);
drivers/input/serio/i8042-sparcio.h
Diff comments   View file @ 1ab1d63
... ... @@ -116,8 +116,7 @@
116 116 if (!kbd_iobase)
117 117 return -ENODEV;
118 118 } else {
119   - int err = of_register_driver(&sparc_i8042_driver,
120   - &of_bus_type);
  119 + int err = of_register_platform_driver(&sparc_i8042_driver);
121 120 if (err)
122 121 return err;
123 122  
... ... @@ -141,7 +140,7 @@
141 140 struct device_node *root = of_find_node_by_path("/");
142 141  
143 142 if (strcmp(root->name, "SUNW,JavaStation-1"))
144   - of_unregister_driver(&sparc_i8042_driver);
  143 + of_unregister_platform_driver(&sparc_i8042_driver);
145 144 }
146 145  
147 146 #else /* !CONFIG_PCI */
drivers/mtd/maps/sun_uflash.c
Diff comments   View file @ 1ab1d63
... ... @@ -160,12 +160,12 @@
160 160  
161 161 static int __init uflash_init(void)
162 162 {
163   - return of_register_driver(&uflash_driver, &of_bus_type);
  163 + return of_register_platform_driver(&uflash_driver);
164 164 }
165 165  
166 166 static void __exit uflash_exit(void)
167 167 {
168   - of_unregister_driver(&uflash_driver);
  168 + of_unregister_platform_driver(&uflash_driver);
169 169 }
170 170  
171 171 module_init(uflash_init);
drivers/net/ibm_newemac/core.c
Diff comments   View file @ 1ab1d63
... ... @@ -2339,11 +2339,11 @@
2339 2339 deps[EMAC_DEP_MDIO_IDX].phandle = dev->mdio_ph;
2340 2340 if (dev->blist && dev->blist > emac_boot_list)
2341 2341 deps[EMAC_DEP_PREV_IDX].phandle = 0xffffffffu;
2342   - bus_register_notifier(&of_platform_bus_type, &emac_of_bus_notifier);
  2342 + bus_register_notifier(&platform_bus_type, &emac_of_bus_notifier);
2343 2343 wait_event_timeout(emac_probe_wait,
2344 2344 emac_check_deps(dev, deps),
2345 2345 EMAC_PROBE_DEP_TIMEOUT);
2346   - bus_unregister_notifier(&of_platform_bus_type, &emac_of_bus_notifier);
  2346 + bus_unregister_notifier(&platform_bus_type, &emac_of_bus_notifier);
2347 2347 err = emac_check_deps(dev, deps) ? 0 : -ENODEV;
2348 2348 for (i = 0; i < EMAC_DEP_COUNT; i++) {
2349 2349 if (deps[i].node)
drivers/net/myri_sbus.c
Diff comments   View file @ 1ab1d63
... ... @@ -1172,12 +1172,12 @@
1172 1172  
1173 1173 static int __init myri_sbus_init(void)
1174 1174 {
1175   - return of_register_driver(&myri_sbus_driver, &of_bus_type);
  1175 + return of_register_platform_driver(&myri_sbus_driver);
1176 1176 }
1177 1177  
1178 1178 static void __exit myri_sbus_exit(void)
1179 1179 {
1180   - of_unregister_driver(&myri_sbus_driver);
  1180 + of_unregister_platform_driver(&myri_sbus_driver);
1181 1181 }
1182 1182  
1183 1183 module_init(myri_sbus_init);
... ... @@ -10251,14 +10251,14 @@
10251 10251 niu_debug = netif_msg_init(debug, NIU_MSG_DEFAULT);
10252 10252  
10253 10253 #ifdef CONFIG_SPARC64
10254   - err = of_register_driver(&niu_of_driver, &of_bus_type);
  10254 + err = of_register_platform_driver(&niu_of_driver);
10255 10255 #endif
10256 10256  
10257 10257 if (!err) {
10258 10258 err = pci_register_driver(&niu_pci_driver);
10259 10259 #ifdef CONFIG_SPARC64
10260 10260 if (err)
10261   - of_unregister_driver(&niu_of_driver);
  10261 + of_unregister_platform_driver(&niu_of_driver);
10262 10262 #endif
10263 10263 }
10264 10264  
... ... @@ -10269,7 +10269,7 @@
10269 10269 {
10270 10270 pci_unregister_driver(&niu_pci_driver);
10271 10271 #ifdef CONFIG_SPARC64
10272   - of_unregister_driver(&niu_of_driver);
  10272 + of_unregister_platform_driver(&niu_of_driver);
10273 10273 #endif
10274 10274 }
10275 10275  
drivers/net/sunbmac.c
Diff comments   View file @ 1ab1d63
... ... @@ -1301,12 +1301,12 @@
1301 1301  
1302 1302 static int __init bigmac_init(void)
1303 1303 {
1304   - return of_register_driver(&bigmac_sbus_driver, &of_bus_type);
  1304 + return of_register_platform_driver(&bigmac_sbus_driver);
1305 1305 }
1306 1306  
1307 1307 static void __exit bigmac_exit(void)
1308 1308 {
1309   - of_unregister_driver(&bigmac_sbus_driver);
  1309 + of_unregister_platform_driver(&bigmac_sbus_driver);
1310 1310 }
1311 1311  
1312 1312 module_init(bigmac_init);
drivers/net/sunhme.c
Diff comments   View file @ 1ab1d63
... ... @@ -3304,7 +3304,7 @@
3304 3304 {
3305 3305 int err;
3306 3306  
3307   - err = of_register_driver(&hme_sbus_driver, &of_bus_type);
  3307 + err = of_register_platform_driver(&hme_sbus_driver);
3308 3308 if (!err)
3309 3309 err = quattro_sbus_register_irqs();
3310 3310  
... ... @@ -3313,7 +3313,7 @@
3313 3313  
3314 3314 static void happy_meal_sbus_exit(void)
3315 3315 {
3316   - of_unregister_driver(&hme_sbus_driver);
  3316 + of_unregister_platform_driver(&hme_sbus_driver);
3317 3317 quattro_sbus_free_irqs();
3318 3318  
3319 3319 while (qfe_sbus_list) {
drivers/net/sunlance.c
Diff comments   View file @ 1ab1d63
... ... @@ -1558,12 +1558,12 @@
1558 1558 /* Find all the lance cards on the system and initialize them */
1559 1559 static int __init sparc_lance_init(void)
1560 1560 {
1561   - return of_register_driver(&sunlance_sbus_driver, &of_bus_type);
  1561 + return of_register_platform_driver(&sunlance_sbus_driver);
1562 1562 }
1563 1563  
1564 1564 static void __exit sparc_lance_exit(void)
1565 1565 {
1566   - of_unregister_driver(&sunlance_sbus_driver);
  1566 + of_unregister_platform_driver(&sunlance_sbus_driver);
1567 1567 }
1568 1568  
1569 1569 module_init(sparc_lance_init);
... ... @@ -988,12 +988,12 @@
988 988  
989 989 static int __init qec_init(void)
990 990 {
991   - return of_register_driver(&qec_sbus_driver, &of_bus_type);
  991 + return of_register_platform_driver(&qec_sbus_driver);
992 992 }
993 993  
994 994 static void __exit qec_exit(void)
995 995 {
996   - of_unregister_driver(&qec_sbus_driver);
  996 + of_unregister_platform_driver(&qec_sbus_driver);
997 997  
998 998 while (root_qec_dev) {
999 999 struct sunqec *next = root_qec_dev->next_module;
drivers/parport/parport_sunbpp.c
Diff comments   View file @ 1ab1d63
... ... @@ -393,12 +393,12 @@
393 393  
394 394 static int __init parport_sunbpp_init(void)
395 395 {
396   - return of_register_driver(&bpp_sbus_driver, &of_bus_type);
  396 + return of_register_platform_driver(&bpp_sbus_driver);
397 397 }
398 398  
399 399 static void __exit parport_sunbpp_exit(void)
400 400 {
401   - of_unregister_driver(&bpp_sbus_driver);
  401 + of_unregister_platform_driver(&bpp_sbus_driver);
402 402 }
403 403  
404 404 MODULE_AUTHOR("Derrick J Brashear");
drivers/sbus/char/bbc_i2c.c
Diff comments   View file @ 1ab1d63
... ... @@ -425,12 +425,12 @@
425 425  
426 426 static int __init bbc_i2c_init(void)
427 427 {
428   - return of_register_driver(&bbc_i2c_driver, &of_bus_type);
  428 + return of_register_platform_driver(&bbc_i2c_driver);
429 429 }
430 430  
431 431 static void __exit bbc_i2c_exit(void)
432 432 {
433   - of_unregister_driver(&bbc_i2c_driver);
  433 + of_unregister_platform_driver(&bbc_i2c_driver);
434 434 }
435 435  
436 436 module_init(bbc_i2c_init);
drivers/sbus/char/display7seg.c
Diff comments   View file @ 1ab1d63
... ... @@ -277,12 +277,12 @@
277 277  
278 278 static int __init d7s_init(void)
279 279 {
280   - return of_register_driver(&d7s_driver, &of_bus_type);
  280 + return of_register_platform_driver(&d7s_driver);
281 281 }
282 282  
283 283 static void __exit d7s_exit(void)
284 284 {
285   - of_unregister_driver(&d7s_driver);
  285 + of_unregister_platform_driver(&d7s_driver);
286 286 }
287 287  
288 288 module_init(d7s_init);
drivers/sbus/char/envctrl.c
Diff comments   View file @ 1ab1d63
... ... @@ -1142,12 +1142,12 @@
1142 1142  
1143 1143 static int __init envctrl_init(void)
1144 1144 {
1145   - return of_register_driver(&envctrl_driver, &of_bus_type);
  1145 + return of_register_platform_driver(&envctrl_driver);
1146 1146 }
1147 1147  
1148 1148 static void __exit envctrl_exit(void)
1149 1149 {
1150   - of_unregister_driver(&envctrl_driver);
  1150 + of_unregister_platform_driver(&envctrl_driver);
1151 1151 }
1152 1152  
1153 1153 module_init(envctrl_init);
drivers/sbus/char/flash.c
Diff comments   View file @ 1ab1d63
... ... @@ -218,12 +218,12 @@
218 218  
219 219 static int __init flash_init(void)
220 220 {
221   - return of_register_driver(&flash_driver, &of_bus_type);
  221 + return of_register_platform_driver(&flash_driver);
222 222 }
223 223  
224 224 static void __exit flash_cleanup(void)
225 225 {
226   - of_unregister_driver(&flash_driver);
  226 + of_unregister_platform_driver(&flash_driver);
227 227 }
228 228  
229 229 module_init(flash_init);
drivers/sbus/char/uctrl.c
Diff comments   View file @ 1ab1d63
... ... @@ -437,12 +437,12 @@
437 437  
438 438 static int __init uctrl_init(void)
439 439 {
440   - return of_register_driver(&uctrl_driver, &of_bus_type);
  440 + return of_register_platform_driver(&uctrl_driver);
441 441 }
442 442  
443 443 static void __exit uctrl_exit(void)
444 444 {
445   - of_unregister_driver(&uctrl_driver);
  445 + of_unregister_platform_driver(&uctrl_driver);
446 446 }
447 447  
448 448 module_init(uctrl_init);
drivers/scsi/qlogicpti.c
Diff comments   View file @ 1ab1d63
... ... @@ -1467,12 +1467,12 @@
1467 1467  
1468 1468 static int __init qpti_init(void)
1469 1469 {
1470   - return of_register_driver(&qpti_sbus_driver, &of_bus_type);
  1470 + return of_register_platform_driver(&qpti_sbus_driver);
1471 1471 }
1472 1472  
1473 1473 static void __exit qpti_exit(void)
1474 1474 {
1475   - of_unregister_driver(&qpti_sbus_driver);
  1475 + of_unregister_platform_driver(&qpti_sbus_driver);
1476 1476 }
1477 1477  
1478 1478 MODULE_DESCRIPTION("QlogicISP SBUS driver");
drivers/scsi/sun_esp.c
Diff comments   View file @ 1ab1d63
... ... @@ -644,12 +644,12 @@
644 644  
645 645 static int __init sunesp_init(void)
646 646 {
647   - return of_register_driver(&esp_sbus_driver, &of_bus_type);
  647 + return of_register_platform_driver(&esp_sbus_driver);
648 648 }
649 649  
650 650 static void __exit sunesp_exit(void)
651 651 {
652   - of_unregister_driver(&esp_sbus_driver);
  652 + of_unregister_platform_driver(&esp_sbus_driver);
653 653 }
654 654  
655 655 MODULE_DESCRIPTION("Sun ESP SCSI driver");
drivers/serial/sunhv.c
Diff comments   View file @ 1ab1d63
... ... @@ -644,12 +644,12 @@
644 644 if (tlb_type != hypervisor)
645 645 return -ENODEV;
646 646  
647   - return of_register_driver(&hv_driver, &of_bus_type);
  647 + return of_register_platform_driver(&hv_driver);
648 648 }
649 649  
650 650 static void __exit sunhv_exit(void)
651 651 {
652   - of_unregister_driver(&hv_driver);
  652 + of_unregister_platform_driver(&hv_driver);
653 653 }
654 654  
655 655 module_init(sunhv_init);
drivers/serial/sunsab.c
Diff comments   View file @ 1ab1d63
... ... @@ -1130,12 +1130,12 @@
1130 1130 }
1131 1131 }
1132 1132  
1133   - return of_register_driver(&sab_driver, &of_bus_type);
  1133 + return of_register_platform_driver(&sab_driver);
1134 1134 }
1135 1135  
1136 1136 static void __exit sunsab_exit(void)
1137 1137 {
1138   - of_unregister_driver(&sab_driver);
  1138 + of_unregister_platform_driver(&sab_driver);
1139 1139 if (sunsab_reg.nr) {
1140 1140 sunserial_unregister_minors(&sunsab_reg, sunsab_reg.nr);
1141 1141 }
drivers/serial/sunsu.c
Diff comments   View file @ 1ab1d63
... ... @@ -1586,7 +1586,7 @@
1586 1586 return err;
1587 1587 }
1588 1588  
1589   - err = of_register_driver(&su_driver, &of_bus_type);
  1589 + err = of_register_platform_driver(&su_driver);
1590 1590 if (err && num_uart)
1591 1591 sunserial_unregister_minors(&sunsu_reg, num_uart);
1592 1592  
drivers/serial/sunzilog.c
Diff comments   View file @ 1ab1d63
... ... @@ -1576,7 +1576,7 @@
1576 1576 goto out_free_tables;
1577 1577 }
1578 1578  
1579   - err = of_register_driver(&zs_driver, &of_bus_type);
  1579 + err = of_register_platform_driver(&zs_driver);
1580 1580 if (err)
1581 1581 goto out_unregister_uart;
1582 1582  
... ... @@ -1604,7 +1604,7 @@
1604 1604 return err;
1605 1605  
1606 1606 out_unregister_driver:
1607   - of_unregister_driver(&zs_driver);
  1607 + of_unregister_platform_driver(&zs_driver);
1608 1608  
1609 1609 out_unregister_uart:
1610 1610 if (num_sunzilog) {
... ... @@ -1619,7 +1619,7 @@
1619 1619  
1620 1620 static void __exit sunzilog_exit(void)
1621 1621 {
1622   - of_unregister_driver(&zs_driver);
  1622 + of_unregister_platform_driver(&zs_driver);
1623 1623  
1624 1624 if (zilog_irq != -1) {
1625 1625 struct uart_sunzilog_port *up = sunzilog_irq_chain;
... ... @@ -390,12 +390,12 @@
390 390 if (fb_get_options("bw2fb", NULL))
391 391 return -ENODEV;
392 392  
393   - return of_register_driver(&bw2_driver, &of_bus_type);
  393 + return of_register_platform_driver(&bw2_driver);
394 394 }
395 395  
396 396 static void __exit bw2_exit(void)
397 397 {
398   - of_unregister_driver(&bw2_driver);
  398 + of_unregister_platform_driver(&bw2_driver);
399 399 }
400 400  
401 401 module_init(bw2_init);
drivers/video/cg14.c
Diff comments   View file @ 1ab1d63
... ... @@ -610,12 +610,12 @@
610 610 if (fb_get_options("cg14fb", NULL))
611 611 return -ENODEV;
612 612  
613   - return of_register_driver(&cg14_driver, &of_bus_type);
  613 + return of_register_platform_driver(&cg14_driver);
614 614 }
615 615  
616 616 static void __exit cg14_exit(void)
617 617 {
618   - of_unregister_driver(&cg14_driver);
  618 + of_unregister_platform_driver(&cg14_driver);
619 619 }
620 620  
621 621 module_init(cg14_init);
... ... @@ -477,12 +477,12 @@
477 477 if (fb_get_options("cg3fb", NULL))
478 478 return -ENODEV;
479 479  
480   - return of_register_driver(&cg3_driver, &of_bus_type);
  480 + return of_register_platform_driver(&cg3_driver);
481 481 }
482 482  
483 483 static void __exit cg3_exit(void)
484 484 {
485   - of_unregister_driver(&cg3_driver);
  485 + of_unregister_platform_driver(&cg3_driver);
486 486 }
487 487  
488 488 module_init(cg3_init);
... ... @@ -870,12 +870,12 @@
870 870 if (fb_get_options("cg6fb", NULL))
871 871 return -ENODEV;
872 872  
873   - return of_register_driver(&cg6_driver, &of_bus_type);
  873 + return of_register_platform_driver(&cg6_driver);
874 874 }
875 875  
876 876 static void __exit cg6_exit(void)
877 877 {
878   - of_unregister_driver(&cg6_driver);
  878 + of_unregister_platform_driver(&cg6_driver);
879 879 }
880 880  
881 881 module_init(cg6_init);
... ... @@ -1067,12 +1067,12 @@
1067 1067 if (fb_get_options("ffb", NULL))
1068 1068 return -ENODEV;
1069 1069  
1070   - return of_register_driver(&ffb_driver, &of_bus_type);
  1070 + return of_register_platform_driver(&ffb_driver);
1071 1071 }
1072 1072  
1073 1073 static void __exit ffb_exit(void)
1074 1074 {
1075   - of_unregister_driver(&ffb_driver);
  1075 + of_unregister_platform_driver(&ffb_driver);
1076 1076 }
1077 1077  
1078 1078 module_init(ffb_init);
... ... @@ -677,12 +677,12 @@
677 677 if (fb_get_options("leofb", NULL))
678 678 return -ENODEV;
679 679  
680   - return of_register_driver(&leo_driver, &of_bus_type);
  680 + return of_register_platform_driver(&leo_driver);
681 681 }
682 682  
683 683 static void __exit leo_exit(void)
684 684 {
685   - of_unregister_driver(&leo_driver);
  685 + of_unregister_platform_driver(&leo_driver);
686 686 }
687 687  
688 688 module_init(leo_init);
drivers/video/p9100.c
Diff comments   View file @ 1ab1d63
... ... @@ -367,12 +367,12 @@
367 367 if (fb_get_options("p9100fb", NULL))
368 368 return -ENODEV;
369 369  
370   - return of_register_driver(&p9100_driver, &of_bus_type);
  370 + return of_register_platform_driver(&p9100_driver);
371 371 }
372 372  
373 373 static void __exit p9100_exit(void)
374 374 {
375   - of_unregister_driver(&p9100_driver);
  375 + of_unregister_platform_driver(&p9100_driver);
376 376 }
377 377  
378 378 module_init(p9100_init);
drivers/video/sunxvr1000.c
Diff comments   View file @ 1ab1d63
... ... @@ -213,12 +213,12 @@
213 213 if (fb_get_options("gfb", NULL))
214 214 return -ENODEV;
215 215  
216   - return of_register_driver(&gfb_driver, &of_bus_type);
  216 + return of_register_platform_driver(&gfb_driver);
217 217 }
218 218  
219 219 static void __exit gfb_exit(void)
220 220 {
221   - of_unregister_driver(&gfb_driver);
  221 + of_unregister_platform_driver(&gfb_driver);
222 222 }
223 223  
224 224 module_init(gfb_init);
... ... @@ -526,12 +526,12 @@
526 526 if (fb_get_options("tcxfb", NULL))
527 527 return -ENODEV;
528 528  
529   - return of_register_driver(&tcx_driver, &of_bus_type);
  529 + return of_register_platform_driver(&tcx_driver);
530 530 }
531 531  
532 532 static void __exit tcx_exit(void)
533 533 {
534   - of_unregister_driver(&tcx_driver);
  534 + of_unregister_platform_driver(&tcx_driver);
535 535 }
536 536  
537 537 module_init(tcx_init);
drivers/watchdog/cpwd.c
Diff comments   View file @ 1ab1d63
... ... @@ -688,12 +688,12 @@
688 688  
689 689 static int __init cpwd_init(void)
690 690 {
691   - return of_register_driver(&cpwd_driver, &of_bus_type);
  691 + return of_register_platform_driver(&cpwd_driver);
692 692 }
693 693  
694 694 static void __exit cpwd_exit(void)
695 695 {
696   - of_unregister_driver(&cpwd_driver);
  696 + of_unregister_platform_driver(&cpwd_driver);
697 697 }
698 698  
699 699 module_init(cpwd_init);
drivers/watchdog/riowd.c
Diff comments   View file @ 1ab1d63
... ... @@ -250,12 +250,12 @@
250 250  
251 251 static int __init riowd_init(void)
252 252 {
253   - return of_register_driver(&riowd_driver, &of_bus_type);
  253 + return of_register_platform_driver(&riowd_driver);
254 254 }
255 255  
256 256 static void __exit riowd_exit(void)
257 257 {
258   - of_unregister_driver(&riowd_driver);
  258 + of_unregister_platform_driver(&riowd_driver);
259 259 }
260 260  
261 261 module_init(riowd_init);
include/linux/of_platform.h
Diff comments   View file @ 1ab1d63
... ... @@ -19,12 +19,6 @@
19 19 #include <linux/of_device.h>
20 20 #include <linux/platform_device.h>
21 21  
22   -/*
23   - * of_platform_bus_type isn't it's own bus anymore. It's now just an alias
24   - * for the platform bus.
25   - */
26   -#define of_platform_bus_type platform_bus_type
27   -
28 22 extern const struct of_device_id of_default_bus_ids[];
29 23  
30 24 /*
sound/sparc/amd7930.c
Diff comments   View file @ 1ab1d63
... ... @@ -1075,7 +1075,7 @@
1075 1075  
1076 1076 static int __init amd7930_init(void)
1077 1077 {
1078   - return of_register_driver(&amd7930_sbus_driver, &of_bus_type);
  1078 + return of_register_platform_driver(&amd7930_sbus_driver);
1079 1079 }
1080 1080  
1081 1081 static void __exit amd7930_exit(void)
... ... @@ -1092,7 +1092,7 @@
1092 1092  
1093 1093 amd7930_list = NULL;
1094 1094  
1095   - of_unregister_driver(&amd7930_sbus_driver);
  1095 + of_unregister_platform_driver(&amd7930_sbus_driver);
1096 1096 }
1097 1097  
1098 1098 module_init(amd7930_init);
sound/sparc/cs4231.c
Diff comments   View file @ 1ab1d63
... ... @@ -2120,12 +2120,12 @@
2120 2120  
2121 2121 static int __init cs4231_init(void)
2122 2122 {
2123   - return of_register_driver(&cs4231_driver, &of_bus_type);
  2123 + return of_register_platform_driver(&cs4231_driver);
2124 2124 }
2125 2125  
2126 2126 static void __exit cs4231_exit(void)
2127 2127 {
2128   - of_unregister_driver(&cs4231_driver);
  2128 + of_unregister_platform_driver(&cs4231_driver);
2129 2129 }
2130 2130  
2131 2131 module_init(cs4231_init);
... ... @@ -2699,12 +2699,12 @@
2699 2699 /* Probe for the dbri chip and then attach the driver. */
2700 2700 static int __init dbri_init(void)
2701 2701 {
2702   - return of_register_driver(&dbri_sbus_driver, &of_bus_type);
  2702 + return of_register_platform_driver(&dbri_sbus_driver);
2703 2703 }
2704 2704  
2705 2705 static void __exit dbri_exit(void)
2706 2706 {
2707   - of_unregister_driver(&dbri_sbus_driver);
  2707 + of_unregister_platform_driver(&dbri_sbus_driver);
2708 2708 }
2709 2709  
2710 2710 module_init(dbri_init);