of/platform: remove all of_bus_type and of_platform_bus_type references
authorGrant Likely <grant.likely@secretlab.ca>
Thu, 24 Jun 2010 21:14:37 +0000 (15:14 -0600)
committerGrant Likely <grant.likely@secretlab.ca>
Sat, 24 Jul 2010 15:57:52 +0000 (09:57 -0600)
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>
59 files changed:
arch/microblaze/kernel/of_platform.c
arch/powerpc/kernel/of_platform.c
arch/sparc/include/asm/of_platform.h
arch/sparc/include/asm/parport.h
arch/sparc/kernel/apc.c
arch/sparc/kernel/auxio_64.c
arch/sparc/kernel/central.c
arch/sparc/kernel/chmc.c
arch/sparc/kernel/of_device_common.c
arch/sparc/kernel/pci_fire.c
arch/sparc/kernel/pci_psycho.c
arch/sparc/kernel/pci_sabre.c
arch/sparc/kernel/pci_schizo.c
arch/sparc/kernel/pci_sun4v.c
arch/sparc/kernel/pmc.c
arch/sparc/kernel/power.c
arch/sparc/kernel/time_32.c
arch/sparc/kernel/time_64.c
drivers/atm/fore200e.c
drivers/char/hw_random/n2-drv.c
drivers/crypto/n2_core.c
drivers/hwmon/ultra45_env.c
drivers/input/misc/sparcspkr.c
drivers/input/serio/i8042-sparcio.h
drivers/mtd/maps/sun_uflash.c
drivers/net/ibm_newemac/core.c
drivers/net/myri_sbus.c
drivers/net/niu.c
drivers/net/sunbmac.c
drivers/net/sunhme.c
drivers/net/sunlance.c
drivers/net/sunqe.c
drivers/parport/parport_sunbpp.c
drivers/sbus/char/bbc_i2c.c
drivers/sbus/char/display7seg.c
drivers/sbus/char/envctrl.c
drivers/sbus/char/flash.c
drivers/sbus/char/uctrl.c
drivers/scsi/qlogicpti.c
drivers/scsi/sun_esp.c
drivers/serial/sunhv.c
drivers/serial/sunsab.c
drivers/serial/sunsu.c
drivers/serial/sunzilog.c
drivers/video/bw2.c
drivers/video/cg14.c
drivers/video/cg3.c
drivers/video/cg6.c
drivers/video/ffb.c
drivers/video/leo.c
drivers/video/p9100.c
drivers/video/sunxvr1000.c
drivers/video/tcx.c
drivers/watchdog/cpwd.c
drivers/watchdog/riowd.c
include/linux/of_platform.h
sound/sparc/amd7930.c
sound/sparc/cs4231.c
sound/sparc/dbri.c

index fb28661043311fcdaf5f9a838af1b902922082f6..80c9c493cb25a91dc02e6efaa0dd6cbda200ee0d 100644 (file)
@@ -57,8 +57,7 @@ struct of_device *of_find_device_by_node(struct device_node *np)
 {
        struct device *dev;
 
-       dev = bus_find_device(&of_platform_bus_type,
-                             NULL, np, of_dev_node_match);
+       dev = bus_find_device(&platform_bus_type, NULL, np, of_dev_node_match);
        if (dev)
                return to_of_device(dev);
        return NULL;
index d3497cd81e8a86bb79c9230c3cd5cab693c79c07..b093d4b1f09cfed957277b0504a82159a70e882e 100644 (file)
@@ -61,8 +61,7 @@ struct of_device *of_find_device_by_node(struct device_node *np)
 {
        struct device *dev;
 
-       dev = bus_find_device(&of_platform_bus_type,
-                             NULL, np, of_dev_node_match);
+       dev = bus_find_device(&platform_bus_type, NULL, np, of_dev_node_match);
        if (dev)
                return to_of_device(dev);
        return NULL;
index 90da99059f832b733f15d23612775502c34e4c66..26540ddfc5119f9959777f4720c1828082402bea 100644 (file)
@@ -13,6 +13,4 @@
  *
  */
 
-#define of_bus_type    of_platform_bus_type    /* for compatibility */
-
 #endif
index 0c34a8792fc72733e3880a233dc83d496be826fc..4891fbce111482b3895dfe073c1003c200370dd3 100644 (file)
@@ -243,9 +243,7 @@ static struct of_platform_driver ecpp_driver = {
 
 static int parport_pc_find_nonpci_ports(int autoirq, int autodma)
 {
-       of_register_driver(&ecpp_driver, &of_bus_type);
-
-       return 0;
+       return of_register_platform_driver(&ecpp_driver);
 }
 
 #endif /* !(_ASM_SPARC64_PARPORT_H */
index b27476caa1333d4fbc2a85b380c4eb3c392c4c97..c471251cd3f12b4d26757627f41b6a871511b86b 100644 (file)
@@ -184,7 +184,7 @@ static struct of_platform_driver apc_driver = {
 
 static int __init apc_init(void)
 {
-       return of_register_driver(&apc_driver, &of_bus_type);
+       return of_register_platform_driver(&apc_driver);
 }
 
 /* This driver is not critical to the boot process
index ddc84128b3c2e4c9be06129f1aecc04f196a3dab..46ba58a8510f30422ec45275db2db812515830f1 100644 (file)
@@ -142,7 +142,7 @@ static struct of_platform_driver auxio_driver = {
 
 static int __init auxio_init(void)
 {
-       return of_register_driver(&auxio_driver, &of_platform_bus_type);
+       return of_register_platform_driver(&auxio_driver);
 }
 
 /* Must be after subsys_initcall() so that busses are probed.  Must
index 434335f65823ec944626a9cbe0b9bbccb28bfd86..b6080c39ed4bf9e34812f9cea4dc674bb0c1dfa4 100644 (file)
@@ -265,8 +265,8 @@ static struct of_platform_driver fhc_driver = {
 
 static int __init sunfire_init(void)
 {
-       (void) of_register_driver(&fhc_driver, &of_platform_bus_type);
-       (void) of_register_driver(&clock_board_driver, &of_platform_bus_type);
+       (void) of_register_platform_driver(&fhc_driver);
+       (void) of_register_platform_driver(&clock_board_driver);
        return 0;
 }
 
index 870cb65b3f216e38b81fc6932afe145067f6aec9..04bb7df9f7161791756f3175dfb508d44e0d34d1 100644 (file)
@@ -848,7 +848,7 @@ static int __init us3mc_init(void)
        ret = register_dimm_printer(us3mc_dimm_printer);
 
        if (!ret) {
-               ret = of_register_driver(&us3mc_driver, &of_bus_type);
+               ret = of_register_platform_driver(&us3mc_driver);
                if (ret)
                        unregister_dimm_printer(us3mc_dimm_printer);
        }
@@ -859,7 +859,7 @@ static void __exit us3mc_cleanup(void)
 {
        if (us3mc_platform()) {
                unregister_dimm_printer(us3mc_dimm_printer);
-               of_unregister_driver(&us3mc_driver);
+               of_unregister_platform_driver(&us3mc_driver);
        }
 }
 
index 01f380c7995cdaefcb93c7572d9d4787a432e7b4..2a5c639e4c3fd30e196940e33eb033d5ca67e4f4 100644 (file)
@@ -21,7 +21,7 @@ static int node_match(struct device *dev, void *data)
 
 struct of_device *of_find_device_by_node(struct device_node *dp)
 {
-       struct device *dev = bus_find_device(&of_platform_bus_type, NULL,
+       struct device *dev = bus_find_device(&platform_bus_type, NULL,
                                             dp, node_match);
 
        if (dev)
index 51cfa09e392ab13f67862c11460e856235b6b9dc..885f10b742e2c44116fb8fb318a6eab557e4bf2b 100644 (file)
@@ -518,7 +518,7 @@ static struct of_platform_driver fire_driver = {
 
 static int __init fire_init(void)
 {
-       return of_register_driver(&fire_driver, &of_bus_type);
+       return of_register_platform_driver(&fire_driver);
 }
 
 subsys_initcall(fire_init);
index 93011e6e7ddc249feb852574d0db4d26932291df..71550a7aacd858351aec8dc9e3d3058da8d44daf 100644 (file)
@@ -612,7 +612,7 @@ static struct of_platform_driver psycho_driver = {
 
 static int __init psycho_init(void)
 {
-       return of_register_driver(&psycho_driver, &of_bus_type);
+       return of_register_platform_driver(&psycho_driver);
 }
 
 subsys_initcall(psycho_init);
index 99c6dba7d4fdec451adca1644b483dd94bb61d69..2d7bf30552ddd176e98dbc70e8901dab716bd950 100644 (file)
@@ -606,7 +606,7 @@ static struct of_platform_driver sabre_driver = {
 
 static int __init sabre_init(void)
 {
-       return of_register_driver(&sabre_driver, &of_bus_type);
+       return of_register_platform_driver(&sabre_driver);
 }
 
 subsys_initcall(sabre_init);
index 9041dae7aacadf7bc33a2a3bc545cb7b14b40f39..04f29c46bfa0c3699f856e177a87141d74a8d074 100644 (file)
@@ -1501,7 +1501,7 @@ static struct of_platform_driver schizo_driver = {
 
 static int __init schizo_init(void)
 {
-       return of_register_driver(&schizo_driver, &of_bus_type);
+       return of_register_platform_driver(&schizo_driver);
 }
 
 subsys_initcall(schizo_init);
index a24af6f7e17f12b125f16d716690e02b663b5f88..18ee8b6f40362615a30536afcb18326bb3a89733 100644 (file)
@@ -1019,7 +1019,7 @@ static struct of_platform_driver pci_sun4v_driver = {
 
 static int __init pci_sun4v_init(void)
 {
-       return of_register_driver(&pci_sun4v_driver, &of_bus_type);
+       return of_register_platform_driver(&pci_sun4v_driver);
 }
 
 subsys_initcall(pci_sun4v_init);
index 9589d8b9b0c17eb59f5d0d2d1b66a94ac3fd655e..a4c73edc8975ed271fda13f859dc68fa03d95214 100644 (file)
@@ -89,7 +89,7 @@ static struct of_platform_driver pmc_driver = {
 
 static int __init pmc_init(void)
 {
-       return of_register_driver(&pmc_driver, &of_bus_type);
+       return of_register_platform_driver(&pmc_driver);
 }
 
 /* This driver is not critical to the boot process
index 1cfee577f6b5588c31b6b038313cc1b5416b4db2..abc194ed5a78bf8e2df397d120c42025bb4151d7 100644 (file)
@@ -70,7 +70,7 @@ static struct of_platform_driver power_driver = {
 
 static int __init power_init(void)
 {
-       return of_register_driver(&power_driver, &of_platform_bus_type);
+       return of_register_platform_driver(&power_driver);
 }
 
 device_initcall(power_init);
index e404b063be2cbc1d141c899c2e91f1ad79463989..5dc20216952ee309ee2073c5a129d8346f62d828 100644 (file)
@@ -189,7 +189,7 @@ static struct of_platform_driver clock_driver = {
 /* Probe for the mostek real time clock chip. */
 static int __init clock_init(void)
 {
-       return of_register_driver(&clock_driver, &of_platform_bus_type);
+       return of_register_platform_driver(&clock_driver);
 }
 /* Must be after subsys_initcall() so that busses are probed.  Must
  * be before device_initcall() because things like the RTC driver
index 21e9fcae0668cdb7994ca856b428fa4a7a74b6e1..2423b336a717e83ec26d3132ff2ec24d8ca21aed 100644 (file)
@@ -586,9 +586,9 @@ static int __init clock_init(void)
        if (tlb_type == hypervisor)
                return platform_device_register(&rtc_sun4v_device);
 
-       (void) of_register_driver(&rtc_driver, &of_platform_bus_type);
-       (void) of_register_driver(&mostek_driver, &of_platform_bus_type);
-       (void) of_register_driver(&bq4802_driver, &of_platform_bus_type);
+       (void) of_register_platform_driver(&rtc_driver);
+       (void) of_register_platform_driver(&mostek_driver);
+       (void) of_register_platform_driver(&bq4802_driver);
 
        return 0;
 }
index 38df87b198d50bd02e9ea3c03c92d08322d71982..b7385e0777176413c2497b780797e81189888632 100644 (file)
@@ -2795,7 +2795,7 @@ static int __init fore200e_module_init(void)
        printk(FORE200E "FORE Systems 200E-series ATM driver - version " FORE200E_VERSION "\n");
 
 #ifdef CONFIG_SBUS
-       err = of_register_driver(&fore200e_sba_driver, &of_bus_type);
+       err = of_register_platform_driver(&fore200e_sba_driver);
        if (err)
                return err;
 #endif
@@ -2806,7 +2806,7 @@ static int __init fore200e_module_init(void)
 
 #ifdef CONFIG_SBUS
        if (err)
-               of_unregister_driver(&fore200e_sba_driver);
+               of_unregister_platform_driver(&fore200e_sba_driver);
 #endif
 
        return err;
@@ -2818,7 +2818,7 @@ static void __exit fore200e_module_cleanup(void)
        pci_unregister_driver(&fore200e_pca_driver);
 #endif
 #ifdef CONFIG_SBUS
-       of_unregister_driver(&fore200e_sba_driver);
+       of_unregister_platform_driver(&fore200e_sba_driver);
 #endif
 }
 
index 0f9cbf1aaf15963bf1acda06f52de1d33836b990..d8a4ca87987d068d34909eb0c6b839b2ab9ebeb5 100644 (file)
@@ -762,12 +762,12 @@ static struct of_platform_driver n2rng_driver = {
 
 static int __init n2rng_init(void)
 {
-       return of_register_driver(&n2rng_driver, &of_bus_type);
+       return of_register_platform_driver(&n2rng_driver);
 }
 
 static void __exit n2rng_exit(void)
 {
-       of_unregister_driver(&n2rng_driver);
+       of_unregister_platform_driver(&n2rng_driver);
 }
 
 module_init(n2rng_init);
index 23163fda5035357a50c892c1a65a35e7ae3a89ea..34ac8ac8aaece6cbac42592a22d8abc1d231d90b 100644 (file)
@@ -2070,20 +2070,20 @@ static struct of_platform_driver n2_mau_driver = {
 
 static int __init n2_init(void)
 {
-       int err = of_register_driver(&n2_crypto_driver, &of_bus_type);
+       int err = of_register_platform_driver(&n2_crypto_driver);
 
        if (!err) {
-               err = of_register_driver(&n2_mau_driver, &of_bus_type);
+               err = of_register_platform_driver(&n2_mau_driver);
                if (err)
-                       of_unregister_driver(&n2_crypto_driver);
+                       of_unregister_platform_driver(&n2_crypto_driver);
        }
        return err;
 }
 
 static void __exit n2_exit(void)
 {
-       of_unregister_driver(&n2_mau_driver);
-       of_unregister_driver(&n2_crypto_driver);
+       of_unregister_platform_driver(&n2_mau_driver);
+       of_unregister_platform_driver(&n2_crypto_driver);
 }
 
 module_init(n2_init);
index 5da5942cf970763be13b716c5bd2a3c10d1af3ab..89643261ccdb93aecc42eb5d735bda668b64c0eb 100644 (file)
@@ -311,12 +311,12 @@ static struct of_platform_driver env_driver = {
 
 static int __init env_init(void)
 {
-       return of_register_driver(&env_driver, &of_bus_type);
+       return of_register_platform_driver(&env_driver);
 }
 
 static void __exit env_exit(void)
 {
-       of_unregister_driver(&env_driver);
+       of_unregister_platform_driver(&env_driver);
 }
 
 module_init(env_init);
index 1dacae4b43f0f32671e42934919526c5502a4dcf..f3bb92e9755fa1d7c9516a93b816006655710f93 100644 (file)
@@ -353,14 +353,12 @@ static struct of_platform_driver grover_beep_driver = {
 
 static int __init sparcspkr_init(void)
 {
-       int err = of_register_driver(&bbc_beep_driver,
-                                    &of_platform_bus_type);
+       int err = of_register_platform_driver(&bbc_beep_driver);
 
        if (!err) {
-               err = of_register_driver(&grover_beep_driver,
-                                        &of_platform_bus_type);
+               err = of_register_platform_driver(&grover_beep_driver);
                if (err)
-                       of_unregister_driver(&bbc_beep_driver);
+                       of_unregister_platform_driver(&bbc_beep_driver);
        }
 
        return err;
@@ -368,8 +366,8 @@ static int __init sparcspkr_init(void)
 
 static void __exit sparcspkr_exit(void)
 {
-       of_unregister_driver(&bbc_beep_driver);
-       of_unregister_driver(&grover_beep_driver);
+       of_unregister_platform_driver(&bbc_beep_driver);
+       of_unregister_platform_driver(&grover_beep_driver);
 }
 
 module_init(sparcspkr_init);
index c7d50ff43fcafd39e23a2826c6a48c9d8a2d3275..cb2a24b947464bfb087a4cf43e6ab0ea939dd5ea 100644 (file)
@@ -116,8 +116,7 @@ static int __init i8042_platform_init(void)
                if (!kbd_iobase)
                        return -ENODEV;
        } else {
-               int err = of_register_driver(&sparc_i8042_driver,
-                                            &of_bus_type);
+               int err = of_register_platform_driver(&sparc_i8042_driver);
                if (err)
                        return err;
 
@@ -141,7 +140,7 @@ static inline void i8042_platform_exit(void)
        struct device_node *root = of_find_node_by_path("/");
 
        if (strcmp(root->name, "SUNW,JavaStation-1"))
-               of_unregister_driver(&sparc_i8042_driver);
+               of_unregister_platform_driver(&sparc_i8042_driver);
 }
 
 #else /* !CONFIG_PCI */
index 0391c2527bd77ac075bf3a2fbc694b49cc5af939..8984236a8d0a5f93f4d31ba0d26d81abdcd9dea2 100644 (file)
@@ -160,12 +160,12 @@ static struct of_platform_driver uflash_driver = {
 
 static int __init uflash_init(void)
 {
-       return of_register_driver(&uflash_driver, &of_bus_type);
+       return of_register_platform_driver(&uflash_driver);
 }
 
 static void __exit uflash_exit(void)
 {
-       of_unregister_driver(&uflash_driver);
+       of_unregister_platform_driver(&uflash_driver);
 }
 
 module_init(uflash_init);
index b150c102ca5ace67ce0fb988266ba88b13023cbe..f10476fb26232d266644c6cb5ef51b4b2d0b675c 100644 (file)
@@ -2339,11 +2339,11 @@ static int __devinit emac_wait_deps(struct emac_instance *dev)
                deps[EMAC_DEP_MDIO_IDX].phandle = dev->mdio_ph;
        if (dev->blist && dev->blist > emac_boot_list)
                deps[EMAC_DEP_PREV_IDX].phandle = 0xffffffffu;
-       bus_register_notifier(&of_platform_bus_type, &emac_of_bus_notifier);
+       bus_register_notifier(&platform_bus_type, &emac_of_bus_notifier);
        wait_event_timeout(emac_probe_wait,
                           emac_check_deps(dev, deps),
                           EMAC_PROBE_DEP_TIMEOUT);
-       bus_unregister_notifier(&of_platform_bus_type, &emac_of_bus_notifier);
+       bus_unregister_notifier(&platform_bus_type, &emac_of_bus_notifier);
        err = emac_check_deps(dev, deps) ? 0 : -ENODEV;
        for (i = 0; i < EMAC_DEP_COUNT; i++) {
                if (deps[i].node)
index 370d3c17f24c1d37298fff19fc538f3f926178c9..04e552aa14ec40a756a4155cd787056ee86f5646 100644 (file)
@@ -1172,12 +1172,12 @@ static struct of_platform_driver myri_sbus_driver = {
 
 static int __init myri_sbus_init(void)
 {
-       return of_register_driver(&myri_sbus_driver, &of_bus_type);
+       return of_register_platform_driver(&myri_sbus_driver);
 }
 
 static void __exit myri_sbus_exit(void)
 {
-       of_unregister_driver(&myri_sbus_driver);
+       of_unregister_platform_driver(&myri_sbus_driver);
 }
 
 module_init(myri_sbus_init);
index f6ecf6180f72476c8e531780221126c032ca1eb8..8cb2b30eccae47ee014277f9e2a98cf4eea849f9 100644 (file)
@@ -10251,14 +10251,14 @@ static int __init niu_init(void)
        niu_debug = netif_msg_init(debug, NIU_MSG_DEFAULT);
 
 #ifdef CONFIG_SPARC64
-       err = of_register_driver(&niu_of_driver, &of_bus_type);
+       err = of_register_platform_driver(&niu_of_driver);
 #endif
 
        if (!err) {
                err = pci_register_driver(&niu_pci_driver);
 #ifdef CONFIG_SPARC64
                if (err)
-                       of_unregister_driver(&niu_of_driver);
+                       of_unregister_platform_driver(&niu_of_driver);
 #endif
        }
 
@@ -10269,7 +10269,7 @@ static void __exit niu_exit(void)
 {
        pci_unregister_driver(&niu_pci_driver);
 #ifdef CONFIG_SPARC64
-       of_unregister_driver(&niu_of_driver);
+       of_unregister_platform_driver(&niu_of_driver);
 #endif
 }
 
index 0b10d24de051c54e3acf9bb2354f3d0bf1d1a4f3..09c071bd6ad421cc5439d87b5727d1810089fe8b 100644 (file)
@@ -1301,12 +1301,12 @@ static struct of_platform_driver bigmac_sbus_driver = {
 
 static int __init bigmac_init(void)
 {
-       return of_register_driver(&bigmac_sbus_driver, &of_bus_type);
+       return of_register_platform_driver(&bigmac_sbus_driver);
 }
 
 static void __exit bigmac_exit(void)
 {
-       of_unregister_driver(&bigmac_sbus_driver);
+       of_unregister_platform_driver(&bigmac_sbus_driver);
 }
 
 module_init(bigmac_init);
index 0a63ebef86a00a5ade1c2d66e25254b22f499ce5..eec443f640790ccde8def34cfd06bd6cf77a6700 100644 (file)
@@ -3304,7 +3304,7 @@ static int __init happy_meal_sbus_init(void)
 {
        int err;
 
-       err = of_register_driver(&hme_sbus_driver, &of_bus_type);
+       err = of_register_platform_driver(&hme_sbus_driver);
        if (!err)
                err = quattro_sbus_register_irqs();
 
@@ -3313,7 +3313,7 @@ static int __init happy_meal_sbus_init(void)
 
 static void happy_meal_sbus_exit(void)
 {
-       of_unregister_driver(&hme_sbus_driver);
+       of_unregister_platform_driver(&hme_sbus_driver);
        quattro_sbus_free_irqs();
 
        while (qfe_sbus_list) {
index c6bfdad6c0c806199d752ba91f09e8bacc78b8ac..ee364fa756342686d12618775790ea37a97f6e49 100644 (file)
@@ -1558,12 +1558,12 @@ static struct of_platform_driver sunlance_sbus_driver = {
 /* Find all the lance cards on the system and initialize them */
 static int __init sparc_lance_init(void)
 {
-       return of_register_driver(&sunlance_sbus_driver, &of_bus_type);
+       return of_register_platform_driver(&sunlance_sbus_driver);
 }
 
 static void __exit sparc_lance_exit(void)
 {
-       of_unregister_driver(&sunlance_sbus_driver);
+       of_unregister_platform_driver(&sunlance_sbus_driver);
 }
 
 module_init(sparc_lance_init);
index 4465174870845caa429bdac513bf7b9d83bb4ade..5f84a5dadeddd90feca5e72221506c001c416314 100644 (file)
@@ -988,12 +988,12 @@ static struct of_platform_driver qec_sbus_driver = {
 
 static int __init qec_init(void)
 {
-       return of_register_driver(&qec_sbus_driver, &of_bus_type);
+       return of_register_platform_driver(&qec_sbus_driver);
 }
 
 static void __exit qec_exit(void)
 {
-       of_unregister_driver(&qec_sbus_driver);
+       of_unregister_platform_driver(&qec_sbus_driver);
 
        while (root_qec_dev) {
                struct sunqec *next = root_qec_dev->next_module;
index 3cdfe96e8999161c6fca7efc9ecfe4ff406b6b0c..210a6441a0662c08953b510d813ef15af8c865ac 100644 (file)
@@ -393,12 +393,12 @@ static struct of_platform_driver bpp_sbus_driver = {
 
 static int __init parport_sunbpp_init(void)
 {
-       return of_register_driver(&bpp_sbus_driver, &of_bus_type);
+       return of_register_platform_driver(&bpp_sbus_driver);
 }
 
 static void __exit parport_sunbpp_exit(void)
 {
-       of_unregister_driver(&bpp_sbus_driver);
+       of_unregister_platform_driver(&bpp_sbus_driver);
 }
 
 MODULE_AUTHOR("Derrick J Brashear");
index 40d7a1fc69af5481183ab1cbb2c72919ad041ac3..3e89c313e98dddeab4b405a70007eb98aee4be31 100644 (file)
@@ -425,12 +425,12 @@ static struct of_platform_driver bbc_i2c_driver = {
 
 static int __init bbc_i2c_init(void)
 {
-       return of_register_driver(&bbc_i2c_driver, &of_bus_type);
+       return of_register_platform_driver(&bbc_i2c_driver);
 }
 
 static void __exit bbc_i2c_exit(void)
 {
-       of_unregister_driver(&bbc_i2c_driver);
+       of_unregister_platform_driver(&bbc_i2c_driver);
 }
 
 module_init(bbc_i2c_init);
index 7baf1b644039dd0e9282661051760eba8f20d010..8fd362e7fa656d7db93f1ddd2964f77809cb6d55 100644 (file)
@@ -277,12 +277,12 @@ static struct of_platform_driver d7s_driver = {
 
 static int __init d7s_init(void)
 {
-       return of_register_driver(&d7s_driver, &of_bus_type);
+       return of_register_platform_driver(&d7s_driver);
 }
 
 static void __exit d7s_exit(void)
 {
-       of_unregister_driver(&d7s_driver);
+       of_unregister_platform_driver(&d7s_driver);
 }
 
 module_init(d7s_init);
index c8166ecf527601423681e0311bfa9ad28de4acb4..2c76f700265b2183c864b937c3f9e7fe9158f8bb 100644 (file)
@@ -1142,12 +1142,12 @@ static struct of_platform_driver envctrl_driver = {
 
 static int __init envctrl_init(void)
 {
-       return of_register_driver(&envctrl_driver, &of_bus_type);
+       return of_register_platform_driver(&envctrl_driver);
 }
 
 static void __exit envctrl_exit(void)
 {
-       of_unregister_driver(&envctrl_driver);
+       of_unregister_platform_driver(&envctrl_driver);
 }
 
 module_init(envctrl_init);
index 368d66294d831ea8fdba4ef0e1e66c92b7f5fd87..d79f386c3486722c294406f522e17ab46e886db5 100644 (file)
@@ -218,12 +218,12 @@ static struct of_platform_driver flash_driver = {
 
 static int __init flash_init(void)
 {
-       return of_register_driver(&flash_driver, &of_bus_type);
+       return of_register_platform_driver(&flash_driver);
 }
 
 static void __exit flash_cleanup(void)
 {
-       of_unregister_driver(&flash_driver);
+       of_unregister_platform_driver(&flash_driver);
 }
 
 module_init(flash_init);
index b8b40e9eca79ba1fa6891fdf6fd9f8116c48e8cf..57f0612bb0131354e7fad822926c71e36c384657 100644 (file)
@@ -437,12 +437,12 @@ static struct of_platform_driver uctrl_driver = {
 
 static int __init uctrl_init(void)
 {
-       return of_register_driver(&uctrl_driver, &of_bus_type);
+       return of_register_platform_driver(&uctrl_driver);
 }
 
 static void __exit uctrl_exit(void)
 {
-       of_unregister_driver(&uctrl_driver);
+       of_unregister_platform_driver(&uctrl_driver);
 }
 
 module_init(uctrl_init);
index 3f5b5411e6bca1634c53d11aa1bfe4e23bfd68ac..53d7ed0dc169b24c8e4350418817fc7c61819c55 100644 (file)
@@ -1467,12 +1467,12 @@ static struct of_platform_driver qpti_sbus_driver = {
 
 static int __init qpti_init(void)
 {
-       return of_register_driver(&qpti_sbus_driver, &of_bus_type);
+       return of_register_platform_driver(&qpti_sbus_driver);
 }
 
 static void __exit qpti_exit(void)
 {
-       of_unregister_driver(&qpti_sbus_driver);
+       of_unregister_platform_driver(&qpti_sbus_driver);
 }
 
 MODULE_DESCRIPTION("QlogicISP SBUS driver");
index ddc221acd14c93579d0e52b98cd9f98d0aa83bbe..89ba6fe02f80e3e7f9c249ec10f7155b5e13ac4a 100644 (file)
@@ -644,12 +644,12 @@ static struct of_platform_driver esp_sbus_driver = {
 
 static int __init sunesp_init(void)
 {
-       return of_register_driver(&esp_sbus_driver, &of_bus_type);
+       return of_register_platform_driver(&esp_sbus_driver);
 }
 
 static void __exit sunesp_exit(void)
 {
-       of_unregister_driver(&esp_sbus_driver);
+       of_unregister_platform_driver(&esp_sbus_driver);
 }
 
 MODULE_DESCRIPTION("Sun ESP SCSI driver");
index 36e244867dd8d9c67e4c68c3a2b28b14110ccd56..a779e22d213ee3abd9f5c1cfa6f267a4fdba96c8 100644 (file)
@@ -644,12 +644,12 @@ static int __init sunhv_init(void)
        if (tlb_type != hypervisor)
                return -ENODEV;
 
-       return of_register_driver(&hv_driver, &of_bus_type);
+       return of_register_platform_driver(&hv_driver);
 }
 
 static void __exit sunhv_exit(void)
 {
-       of_unregister_driver(&hv_driver);
+       of_unregister_platform_driver(&hv_driver);
 }
 
 module_init(sunhv_init);
index 0a7dd6841ff8427fddf66b4896c9870aa090e49d..9845fb1cfb1ffea3438681f8c36f2c42fa58556d 100644 (file)
@@ -1130,12 +1130,12 @@ static int __init sunsab_init(void)
                }
        }
 
-       return of_register_driver(&sab_driver, &of_bus_type);
+       return of_register_platform_driver(&sab_driver);
 }
 
 static void __exit sunsab_exit(void)
 {
-       of_unregister_driver(&sab_driver);
+       of_unregister_platform_driver(&sab_driver);
        if (sunsab_reg.nr) {
                sunserial_unregister_minors(&sunsab_reg, sunsab_reg.nr);
        }
index 5deafc8180b5ad69d6cc741b4081ab224ef94d2d..3cdf74822db51336f98f955efcbebf95090b47cc 100644 (file)
@@ -1586,7 +1586,7 @@ static int __init sunsu_init(void)
                        return err;
        }
 
-       err = of_register_driver(&su_driver, &of_bus_type);
+       err = of_register_platform_driver(&su_driver);
        if (err && num_uart)
                sunserial_unregister_minors(&sunsu_reg, num_uart);
 
index fcbe20d48039fd0550a0583ca909fab4bbe8c6e5..d1e6bcb59546b993128edacac119182b834a01e3 100644 (file)
@@ -1576,7 +1576,7 @@ static int __init sunzilog_init(void)
                        goto out_free_tables;
        }
 
-       err = of_register_driver(&zs_driver, &of_bus_type);
+       err = of_register_platform_driver(&zs_driver);
        if (err)
                goto out_unregister_uart;
 
@@ -1604,7 +1604,7 @@ out:
        return err;
 
 out_unregister_driver:
-       of_unregister_driver(&zs_driver);
+       of_unregister_platform_driver(&zs_driver);
 
 out_unregister_uart:
        if (num_sunzilog) {
@@ -1619,7 +1619,7 @@ out_free_tables:
 
 static void __exit sunzilog_exit(void)
 {
-       of_unregister_driver(&zs_driver);
+       of_unregister_platform_driver(&zs_driver);
 
        if (zilog_irq != -1) {
                struct uart_sunzilog_port *up = sunzilog_irq_chain;
index 09f1b9b462f4a8a4ce86a600aa55a4cbf1685622..c7796637bafd2c1ae0d6501751e90d362e77e48e 100644 (file)
@@ -390,12 +390,12 @@ static int __init bw2_init(void)
        if (fb_get_options("bw2fb", NULL))
                return -ENODEV;
 
-       return of_register_driver(&bw2_driver, &of_bus_type);
+       return of_register_platform_driver(&bw2_driver);
 }
 
 static void __exit bw2_exit(void)
 {
-       of_unregister_driver(&bw2_driver);
+       of_unregister_platform_driver(&bw2_driver);
 }
 
 module_init(bw2_init);
index e5dc2241194fed66606c1e694aa4c77ed3357c81..d09fde8beb69b548bec3eac39a6399aa29a614a4 100644 (file)
@@ -610,12 +610,12 @@ static int __init cg14_init(void)
        if (fb_get_options("cg14fb", NULL))
                return -ENODEV;
 
-       return of_register_driver(&cg14_driver, &of_bus_type);
+       return of_register_platform_driver(&cg14_driver);
 }
 
 static void __exit cg14_exit(void)
 {
-       of_unregister_driver(&cg14_driver);
+       of_unregister_platform_driver(&cg14_driver);
 }
 
 module_init(cg14_init);
index 558d73a948a0d836c73ea20c26440229738ba581..64aa29809fb970dcb1740eb72e69cafb5cb62660 100644 (file)
@@ -477,12 +477,12 @@ static int __init cg3_init(void)
        if (fb_get_options("cg3fb", NULL))
                return -ENODEV;
 
-       return of_register_driver(&cg3_driver, &of_bus_type);
+       return of_register_platform_driver(&cg3_driver);
 }
 
 static void __exit cg3_exit(void)
 {
-       of_unregister_driver(&cg3_driver);
+       of_unregister_platform_driver(&cg3_driver);
 }
 
 module_init(cg3_init);
index 480d761a27a839b1e265eefe8204a17fb1f56504..2389a719dcc737e04043f7c6d01a5c172ae65481 100644 (file)
@@ -870,12 +870,12 @@ static int __init cg6_init(void)
        if (fb_get_options("cg6fb", NULL))
                return -ENODEV;
 
-       return of_register_driver(&cg6_driver, &of_bus_type);
+       return of_register_platform_driver(&cg6_driver);
 }
 
 static void __exit cg6_exit(void)
 {
-       of_unregister_driver(&cg6_driver);
+       of_unregister_platform_driver(&cg6_driver);
 }
 
 module_init(cg6_init);
index 95c0227f47fcfd7fd30ea784b4202af1dace340a..f6ecfab296d39515f3639c3af2f618aa9a702f63 100644 (file)
@@ -1067,12 +1067,12 @@ static int __init ffb_init(void)
        if (fb_get_options("ffb", NULL))
                return -ENODEV;
 
-       return of_register_driver(&ffb_driver, &of_bus_type);
+       return of_register_platform_driver(&ffb_driver);
 }
 
 static void __exit ffb_exit(void)
 {
-       of_unregister_driver(&ffb_driver);
+       of_unregister_platform_driver(&ffb_driver);
 }
 
 module_init(ffb_init);
index 9e8bf7d5e249df2a3d0f3243181bab0b76b633a9..ad677637ffbb0e480e6c318e078a5fcae2f484c2 100644 (file)
@@ -677,12 +677,12 @@ static int __init leo_init(void)
        if (fb_get_options("leofb", NULL))
                return -ENODEV;
 
-       return of_register_driver(&leo_driver, &of_bus_type);
+       return of_register_platform_driver(&leo_driver);
 }
 
 static void __exit leo_exit(void)
 {
-       of_unregister_driver(&leo_driver);
+       of_unregister_platform_driver(&leo_driver);
 }
 
 module_init(leo_init);
index 6552751e81aaa058a18af29ff8892d9abe1a54af..688b055abab2066811a3115bf270319f62dd811d 100644 (file)
@@ -367,12 +367,12 @@ static int __init p9100_init(void)
        if (fb_get_options("p9100fb", NULL))
                return -ENODEV;
 
-       return of_register_driver(&p9100_driver, &of_bus_type);
+       return of_register_platform_driver(&p9100_driver);
 }
 
 static void __exit p9100_exit(void)
 {
-       of_unregister_driver(&p9100_driver);
+       of_unregister_platform_driver(&p9100_driver);
 }
 
 module_init(p9100_init);
index 489b44e8db8153dac7a06bda8abae694c878d7e0..7288934c0d49dacfabee368b6498289f2cf635b5 100644 (file)
@@ -213,12 +213,12 @@ static int __init gfb_init(void)
        if (fb_get_options("gfb", NULL))
                return -ENODEV;
 
-       return of_register_driver(&gfb_driver, &of_bus_type);
+       return of_register_platform_driver(&gfb_driver);
 }
 
 static void __exit gfb_exit(void)
 {
-       of_unregister_driver(&gfb_driver);
+       of_unregister_platform_driver(&gfb_driver);
 }
 
 module_init(gfb_init);
index cc039b33d2d8bd762a493bd650fceb1b0895a52f..f375e0db6776bcefae43c2e26fa08a213c88d6c3 100644 (file)
@@ -526,12 +526,12 @@ static int __init tcx_init(void)
        if (fb_get_options("tcxfb", NULL))
                return -ENODEV;
 
-       return of_register_driver(&tcx_driver, &of_bus_type);
+       return of_register_platform_driver(&tcx_driver);
 }
 
 static void __exit tcx_exit(void)
 {
-       of_unregister_driver(&tcx_driver);
+       of_unregister_platform_driver(&tcx_driver);
 }
 
 module_init(tcx_init);
index 8c03fd71693ef23c82c5db5649c5a395c08c8a1e..30a2512fd52e30fef23cdac728eae59d4b3803af 100644 (file)
@@ -688,12 +688,12 @@ static struct of_platform_driver cpwd_driver = {
 
 static int __init cpwd_init(void)
 {
-       return of_register_driver(&cpwd_driver, &of_bus_type);
+       return of_register_platform_driver(&cpwd_driver);
 }
 
 static void __exit cpwd_exit(void)
 {
-       of_unregister_driver(&cpwd_driver);
+       of_unregister_platform_driver(&cpwd_driver);
 }
 
 module_init(cpwd_init);
index 5dceeddc88596c833add1e6abc2ec5db65048279..4082b4ace1fce159089924d6718918e182fc67f7 100644 (file)
@@ -250,12 +250,12 @@ static struct of_platform_driver riowd_driver = {
 
 static int __init riowd_init(void)
 {
-       return of_register_driver(&riowd_driver, &of_bus_type);
+       return of_register_platform_driver(&riowd_driver);
 }
 
 static void __exit riowd_exit(void)
 {
-       of_unregister_driver(&riowd_driver);
+       of_unregister_platform_driver(&riowd_driver);
 }
 
 module_init(riowd_init);
index 133ecf31a60f3dac79f8f93ce8659e94dc9705d7..429513ae8f6e169718caa8b45fb09240cfb688f8 100644 (file)
 #include <linux/of_device.h>
 #include <linux/platform_device.h>
 
-/*
- * of_platform_bus_type isn't it's own bus anymore.  It's now just an alias
- * for the platform bus.
- */
-#define of_platform_bus_type platform_bus_type
-
 extern const struct of_device_id of_default_bus_ids[];
 
 /*
index 43c63d44108743debc9c97da9bb85dc639f7a464..9eb1a4e0363be8ba203f78ffde906ea202f0e319 100644 (file)
@@ -1075,7 +1075,7 @@ static struct of_platform_driver amd7930_sbus_driver = {
 
 static int __init amd7930_init(void)
 {
-       return of_register_driver(&amd7930_sbus_driver, &of_bus_type);
+       return of_register_platform_driver(&amd7930_sbus_driver);
 }
 
 static void __exit amd7930_exit(void)
@@ -1092,7 +1092,7 @@ static void __exit amd7930_exit(void)
 
        amd7930_list = NULL;
 
-       of_unregister_driver(&amd7930_sbus_driver);
+       of_unregister_platform_driver(&amd7930_sbus_driver);
 }
 
 module_init(amd7930_init);
index f7f05c2463031d70cdedc07c776ad27c7f5b08d1..68570ee2c9bb91079a0948d4832fd0c0a2079eea 100644 (file)
@@ -2120,12 +2120,12 @@ static struct of_platform_driver cs4231_driver = {
 
 static int __init cs4231_init(void)
 {
-       return of_register_driver(&cs4231_driver, &of_bus_type);
+       return of_register_platform_driver(&cs4231_driver);
 }
 
 static void __exit cs4231_exit(void)
 {
-       of_unregister_driver(&cs4231_driver);
+       of_unregister_platform_driver(&cs4231_driver);
 }
 
 module_init(cs4231_init);
index 491ce71c84b60ee54b18a91d99ed53884d3c0d7b..c421901c48d0f40286da25ae42425e528afc8767 100644 (file)
@@ -2699,12 +2699,12 @@ static struct of_platform_driver dbri_sbus_driver = {
 /* Probe for the dbri chip and then attach the driver. */
 static int __init dbri_init(void)
 {
-       return of_register_driver(&dbri_sbus_driver, &of_bus_type);
+       return of_register_platform_driver(&dbri_sbus_driver);
 }
 
 static void __exit dbri_exit(void)
 {
-       of_unregister_driver(&dbri_sbus_driver);
+       of_unregister_platform_driver(&dbri_sbus_driver);
 }
 
 module_init(dbri_init);