of: Remove duplicate fields from of_platform_driver
authorGrant Likely <grant.likely@secretlab.ca>
Tue, 13 Apr 2010 23:13:02 +0000 (16:13 -0700)
committerGrant Likely <grant.likely@secretlab.ca>
Sat, 22 May 2010 06:10:40 +0000 (00:10 -0600)
.name, .match_table and .owner are duplicated in both of_platform_driver
and device_driver.  This patch is a removes the extra copies from struct
of_platform_driver and converts all users to the device_driver members.

This patch is a pretty mechanical change.  The usage model doesn't change
and if any drivers have been missed, or if anything has been fixed up
incorrectly, then it will fail with a compile time error, and the fixup
will be trivial.  This patch looks big and scary because it touches so
many files, but it should be pretty safe.

Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
Acked-by: Sean MacLennan <smaclennan@pikatech.com>
146 files changed:
arch/powerpc/kernel/ibmebus.c
arch/powerpc/kernel/of_platform.c
arch/powerpc/platforms/52xx/mpc52xx_gpio.c
arch/powerpc/platforms/52xx/mpc52xx_gpt.c
arch/powerpc/platforms/52xx/mpc52xx_lpbfifo.c
arch/powerpc/platforms/82xx/ep8248e.c
arch/powerpc/platforms/83xx/suspend.c
arch/powerpc/platforms/cell/axon_msi.c
arch/powerpc/platforms/pasemi/gpio_mdio.c
arch/powerpc/sysdev/axonram.c
arch/powerpc/sysdev/bestcomm/bestcomm.c
arch/powerpc/sysdev/fsl_msi.c
arch/powerpc/sysdev/fsl_pmc.c
arch/powerpc/sysdev/fsl_rio.c
arch/powerpc/sysdev/pmi.c
arch/powerpc/sysdev/qe_lib/qe.c
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/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/ata/pata_mpc52xx.c
drivers/ata/pata_of_platform.c
drivers/ata/sata_fsl.c
drivers/atm/fore200e.c
drivers/block/xsysace.c
drivers/char/hw_random/n2-drv.c
drivers/char/hw_random/pasemi-rng.c
drivers/char/ipmi/ipmi_si_intf.c
drivers/char/xilinx_hwicap/xilinx_hwicap.c
drivers/crypto/amcc/crypto4xx_core.c
drivers/crypto/talitos.c
drivers/dma/fsldma.c
drivers/dma/ppc4xx/adma.c
drivers/edac/mpc85xx_edac.c
drivers/edac/ppc4xx_edac.c
drivers/hwmon/ultra45_env.c
drivers/i2c/busses/i2c-cpm.c
drivers/i2c/busses/i2c-ibm_iic.c
drivers/i2c/busses/i2c-mpc.c
drivers/infiniband/hw/ehca/ehca_main.c
drivers/input/misc/sparcspkr.c
drivers/input/serio/i8042-sparcio.h
drivers/input/serio/xilinx_ps2.c
drivers/leds/leds-gpio.c
drivers/macintosh/smu.c
drivers/macintosh/therm_pm72.c
drivers/macintosh/therm_windtunnel.c
drivers/mmc/host/sdhci-of-core.c
drivers/mtd/maps/physmap_of.c
drivers/mtd/maps/sun_uflash.c
drivers/mtd/nand/fsl_elbc_nand.c
drivers/mtd/nand/fsl_upm.c
drivers/mtd/nand/ndfc.c
drivers/mtd/nand/pasemi_nand.c
drivers/mtd/nand/socrates_nand.c
drivers/net/can/mscan/mpc5xxx_can.c
drivers/net/can/sja1000/sja1000_of_platform.c
drivers/net/ehea/ehea_main.c
drivers/net/fec_mpc52xx.c
drivers/net/fec_mpc52xx_phy.c
drivers/net/fs_enet/fs_enet-main.c
drivers/net/fs_enet/mii-bitbang.c
drivers/net/fs_enet/mii-fec.c
drivers/net/fsl_pq_mdio.c
drivers/net/gianfar.c
drivers/net/ibm_newemac/core.c
drivers/net/ibm_newemac/mal.c
drivers/net/ibm_newemac/rgmii.c
drivers/net/ibm_newemac/tah.c
drivers/net/ibm_newemac/zmii.c
drivers/net/ll_temac_main.c
drivers/net/myri_sbus.c
drivers/net/niu.c
drivers/net/phy/mdio-gpio.c
drivers/net/sunbmac.c
drivers/net/sunhme.c
drivers/net/sunlance.c
drivers/net/sunqe.c
drivers/net/ucc_geth.c
drivers/net/xilinx_emaclite.c
drivers/of/platform.c
drivers/parport/parport_sunbpp.c
drivers/pcmcia/electra_cf.c
drivers/pcmcia/m8xx_pcmcia.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/apbuart.c
drivers/serial/cpm_uart/cpm_uart_core.c
drivers/serial/mpc52xx_uart.c
drivers/serial/of_serial.c
drivers/serial/sunhv.c
drivers/serial/sunsab.c
drivers/serial/sunsu.c
drivers/serial/sunzilog.c
drivers/serial/uartlite.c
drivers/serial/ucc_uart.c
drivers/spi/mpc52xx_psc_spi.c
drivers/spi/mpc52xx_spi.c
drivers/spi/spi_mpc8xxx.c
drivers/spi/spi_ppc4xx.c
drivers/spi/xilinx_spi_of.c
drivers/usb/gadget/fsl_qe_udc.c
drivers/usb/host/ehci-ppc-of.c
drivers/usb/host/ehci-xilinx-of.c
drivers/usb/host/fhci-hcd.c
drivers/usb/host/isp1760-if.c
drivers/usb/host/ohci-ppc-of.c
drivers/video/bw2.c
drivers/video/cg14.c
drivers/video/cg3.c
drivers/video/cg6.c
drivers/video/ffb.c
drivers/video/fsl-diu-fb.c
drivers/video/leo.c
drivers/video/mb862xx/mb862xxfb.c
drivers/video/p9100.c
drivers/video/platinumfb.c
drivers/video/sunxvr1000.c
drivers/video/tcx.c
drivers/video/xilinxfb.c
drivers/watchdog/cpwd.c
drivers/watchdog/gef_wdt.c
drivers/watchdog/mpc8xxx_wdt.c
drivers/watchdog/riowd.c
include/linux/of_platform.h
sound/soc/fsl/mpc5200_psc_ac97.c
sound/soc/fsl/mpc5200_psc_i2s.c
sound/soc/fsl/mpc8610_hpcd.c
sound/sparc/amd7930.c
sound/sparc/cs4231.c
sound/sparc/dbri.c

index 355257bb149d7bfc75d34bbe45c1e811c6cb1eb3..21266abfbda64cb0a11fd2a10aa8f1af47c574a1 100644 (file)
@@ -201,9 +201,6 @@ static int ibmebus_create_devices(const struct of_device_id *matches)
 
 int ibmebus_register_driver(struct of_platform_driver *drv)
 {
-       if (!drv->driver.of_match_table)
-               drv->driver.of_match_table = drv->match_table;
-
        /* If the driver uses devices that ibmebus doesn't know, add them */
        ibmebus_create_devices(drv->driver.of_match_table);
 
index 218853466510bd1c72d3ad64191df5f447afa867..487a98851ba6f04f24fd50d200f712ba29df46ac 100644 (file)
@@ -306,10 +306,11 @@ static struct of_device_id of_pci_phb_ids[] = {
 };
 
 static struct of_platform_driver of_pci_phb_driver = {
-       .match_table = of_pci_phb_ids,
        .probe = of_pci_phb_probe,
        .driver = {
                .name = "of-pci",
+               .owner = THIS_MODULE,
+               .of_match_table = of_pci_phb_ids,
        },
 };
 
index 576669fc4fbf279d7dd8aba7eb4b04c0f14c550a..ca5305a5bd61d8021c50dbb452db5adc376b4a0b 100644 (file)
@@ -193,8 +193,11 @@ static const struct of_device_id mpc52xx_wkup_gpiochip_match[] = {
 };
 
 static struct of_platform_driver mpc52xx_wkup_gpiochip_driver = {
-       .name = "gpio_wkup",
-       .match_table = mpc52xx_wkup_gpiochip_match,
+       .driver = {
+               .name = "gpio_wkup",
+               .owner = THIS_MODULE,
+               .of_match_table = mpc52xx_wkup_gpiochip_match,
+       },
        .probe = mpc52xx_wkup_gpiochip_probe,
        .remove = mpc52xx_gpiochip_remove,
 };
@@ -349,8 +352,11 @@ static const struct of_device_id mpc52xx_simple_gpiochip_match[] = {
 };
 
 static struct of_platform_driver mpc52xx_simple_gpiochip_driver = {
-       .name = "gpio",
-       .match_table = mpc52xx_simple_gpiochip_match,
+       .driver = {
+               .name = "gpio",
+               .owner = THIS_MODULE,
+               .of_match_table = mpc52xx_simple_gpiochip_match,
+       },
        .probe = mpc52xx_simple_gpiochip_probe,
        .remove = mpc52xx_gpiochip_remove,
 };
index 42c507f9c35bb43d1cdb3b4d89215fb7ee5230aa..46c93578cbf048230dc24fcd906a113872eb3bfb 100644 (file)
@@ -784,8 +784,11 @@ static const struct of_device_id mpc52xx_gpt_match[] = {
 };
 
 static struct of_platform_driver mpc52xx_gpt_driver = {
-       .name = "mpc52xx-gpt",
-       .match_table = mpc52xx_gpt_match,
+       .driver = {
+               .name = "mpc52xx-gpt",
+               .owner = THIS_MODULE,
+               .of_match_table = mpc52xx_gpt_match,
+       },
        .probe = mpc52xx_gpt_probe,
        .remove = mpc52xx_gpt_remove,
 };
index 17b99ba7a8cc04be04491297e5825a4e26316ced..e86aec644501b26ff767379dfdc30a07df745e28 100644 (file)
@@ -537,9 +537,11 @@ static struct of_device_id mpc52xx_lpbfifo_match[] __devinitconst = {
 };
 
 static struct of_platform_driver mpc52xx_lpbfifo_driver = {
-       .owner = THIS_MODULE,
-       .name = "mpc52xx-lpbfifo",
-       .match_table = mpc52xx_lpbfifo_match,
+       .driver = {
+               .name = "mpc52xx-lpbfifo",
+               .owner = THIS_MODULE,
+               .of_match_table = mpc52xx_lpbfifo_match,
+       },
        .probe = mpc52xx_lpbfifo_probe,
        .remove = __devexit_p(mpc52xx_lpbfifo_remove),
 };
index 0176ae8249d5e60731f1f7d65a51c888c4383f06..9f2e52b36f91673c4787c650bb1fe8b31ae3a09f 100644 (file)
@@ -170,8 +170,9 @@ static const struct of_device_id ep8248e_mdio_match[] = {
 static struct of_platform_driver ep8248e_mdio_driver = {
        .driver = {
                .name = "ep8248e-mdio-bitbang",
+               .owner = THIS_MODULE,
+               .of_match_table = ep8248e_mdio_match,
        },
-       .match_table = ep8248e_mdio_match,
        .probe = ep8248e_mdio_probe,
        .remove = ep8248e_mdio_remove,
 };
index aa0b764b1cc4172d1745016cfcf745c46db99305..ebe6c353720972f992936da851bff121b651e9f2 100644 (file)
@@ -423,8 +423,11 @@ static struct of_device_id pmc_match[] = {
 };
 
 static struct of_platform_driver pmc_driver = {
-       .name = "mpc83xx-pmc",
-       .match_table = pmc_match,
+       .driver = {
+               .name = "mpc83xx-pmc",
+               .owner = THIS_MODULE,
+               .of_match_table = pmc_match,
+       },
        .probe = pmc_probe,
        .remove = pmc_remove
 };
index 177a4f1369b444edee9c9c633c58e0743a380383..6257e5378615eeab7c687d7375490a48169c8cc6 100644 (file)
@@ -447,11 +447,12 @@ static const struct of_device_id axon_msi_device_id[] = {
 };
 
 static struct of_platform_driver axon_msi_driver = {
-       .match_table    = axon_msi_device_id,
        .probe          = axon_msi_probe,
        .shutdown       = axon_msi_shutdown,
-       .driver         = {
-               .name   = "axon-msi"
+       .driver = {
+               .name = "axon-msi",
+               .owner = THIS_MODULE,
+               .of_match_table = axon_msi_device_id,
        },
 };
 
index c44e1b3b91dbb303461a7511f16542df212722c4..627ee089e75d4bde3b04b3d9ab1ee48d54c931d0 100644 (file)
@@ -301,11 +301,12 @@ MODULE_DEVICE_TABLE(of, gpio_mdio_match);
 
 static struct of_platform_driver gpio_mdio_driver =
 {
-       .match_table    = gpio_mdio_match,
        .probe          = gpio_mdio_probe,
        .remove         = gpio_mdio_remove,
-       .driver         = {
-               .name   = "gpio-mdio-bitbang",
+       .driver = {
+               .name = "gpio-mdio-bitbang",
+               .owner = THIS_MODULE,
+               .of_match_table = gpio_mdio_match,
        },
 };
 
index 88b21fccf0c96141fcb7fc30f3591b590e387223..402d2212162f6bddc0a79506112448d6f6714461 100644 (file)
@@ -327,12 +327,12 @@ static struct of_device_id axon_ram_device_id[] = {
 };
 
 static struct of_platform_driver axon_ram_driver = {
-       .match_table    = axon_ram_device_id,
        .probe          = axon_ram_probe,
        .remove         = axon_ram_remove,
-       .driver         = {
-               .owner  = THIS_MODULE,
-               .name   = AXON_RAM_MODULE_NAME,
+       .driver = {
+               .name = AXON_RAM_MODULE_NAME,
+               .owner = THIS_MODULE,
+               .of_match_table = axon_ram_device_id,
        },
 };
 
index d32d5389b67aa7170dff0db38346dbdf51e1ebbc..a7c5c470af147f73edb4a7448879b20fabf522cc 100644 (file)
@@ -494,14 +494,12 @@ MODULE_DEVICE_TABLE(of, mpc52xx_bcom_of_match);
 
 
 static struct of_platform_driver mpc52xx_bcom_of_platform_driver = {
-       .owner          = THIS_MODULE,
-       .name           = DRIVER_NAME,
-       .match_table    = mpc52xx_bcom_of_match,
        .probe          = mpc52xx_bcom_probe,
        .remove         = mpc52xx_bcom_remove,
-       .driver         = {
-               .name   = DRIVER_NAME,
-               .owner  = THIS_MODULE,
+       .driver = {
+               .name = DRIVER_NAME,
+               .owner = THIS_MODULE,
+               .of_match_table = mpc52xx_bcom_of_match,
        },
 };
 
index 569dae8ea1ce55fd241e613482c09041b758c5a9..a7be144f5874335da103e0af4c33b3b3d1e1f3fe 100644 (file)
@@ -345,8 +345,11 @@ static const struct of_device_id fsl_of_msi_ids[] = {
 };
 
 static struct of_platform_driver fsl_of_msi_driver = {
-       .name = "fsl-msi",
-       .match_table = fsl_of_msi_ids,
+       .driver = {
+               .name = "fsl-msi",
+               .owner = THIS_MODULE,
+               .of_match_table = fsl_of_msi_ids,
+       },
        .probe = fsl_of_msi_probe,
 };
 
index 2ebe817ca72fcaab6919317655e672a58b2a9a7c..9082eb921ad995f7caac8752d00f9dc91cf48381 100644 (file)
@@ -76,8 +76,11 @@ static const struct of_device_id pmc_ids[] = {
 };
 
 static struct of_platform_driver pmc_driver = {
-       .driver.name = "fsl-pmc",
-       .match_table = pmc_ids,
+       .driver = {
+               .name = "fsl-pmc",
+               .owner = THIS_MODULE,
+               .of_match_table = pmc_ids,
+       },
        .probe = pmc_probe,
 };
 
index a98d516392436689b399374a1d3d8eedc6c742fb..6a1fde0d22b04b016ee723ec8baa0c35e0bf0b96 100644 (file)
@@ -1215,8 +1215,11 @@ static const struct of_device_id fsl_of_rio_rpn_ids[] = {
 };
 
 static struct of_platform_driver fsl_of_rio_rpn_driver = {
-       .name = "fsl-of-rio",
-       .match_table = fsl_of_rio_rpn_ids,
+       .driver = {
+               .name = "fsl-of-rio",
+               .owner = THIS_MODULE,
+               .of_match_table = fsl_of_rio_rpn_ids,
+       },
        .probe = fsl_of_rio_rpn_probe,
 };
 
index ff758bff1b7afdf3a1d4638e67ffa9dc6aee9a21..d07137a07d7509b0e6cf082f5de6e421922f2091 100644 (file)
@@ -206,11 +206,12 @@ static int pmi_of_remove(struct of_device *dev)
 }
 
 static struct of_platform_driver pmi_of_platform_driver = {
-       .match_table    = pmi_match,
        .probe          = pmi_of_probe,
        .remove         = pmi_of_remove,
-       .driver         = {
-               .name   = "pmi",
+       .driver = {
+               .name = "pmi",
+               .owner = THIS_MODULE,
+               .of_match_table = pmi_match,
        },
 };
 
index 149393c02c3f117b0f2f9d7e2387b5c83fffcdcf..093e0ae1a9418fc0830be5c6bee35041c774d198 100644 (file)
@@ -669,8 +669,11 @@ static const struct of_device_id qe_ids[] = {
 };
 
 static struct of_platform_driver qe_driver = {
-       .driver.name = "fsl-qe",
-       .match_table = qe_ids,
+       .driver = {
+               .name = "fsl-qe",
+               .owner = THIS_MODULE,
+               .of_match_table = qe_ids,
+       },
        .probe = qe_probe,
        .resume = qe_resume,
 };
index 1bb6a41b00f25d7332dc08888f7d46dfeb0277a3..c333b8d0949bf199b9a88a8b406ff644ca69c74e 100644 (file)
@@ -232,8 +232,11 @@ static const struct of_device_id ecpp_match[] = {
 };
 
 static struct of_platform_driver ecpp_driver = {
-       .name                   = "ecpp",
-       .match_table            = ecpp_match,
+       .driver = {
+               .name = "ecpp",
+               .owner = THIS_MODULE,
+               .of_match_table = ecpp_match,
+       },
        .probe                  = ecpp_probe,
        .remove                 = __devexit_p(ecpp_remove),
 };
index 71ec90b9e3167d890f9a25bf28b451c2e703c9f8..b27476caa1333d4fbc2a85b380c4eb3c392c4c97 100644 (file)
@@ -174,8 +174,11 @@ static struct of_device_id __initdata apc_match[] = {
 MODULE_DEVICE_TABLE(of, apc_match);
 
 static struct of_platform_driver apc_driver = {
-       .name           = "apc",
-       .match_table    = apc_match,
+       .driver = {
+               .name = "apc",
+               .owner = THIS_MODULE,
+               .of_match_table = apc_match,
+       },
        .probe          = apc_probe,
 };
 
index bd8421a268569612b454ee42ce1b260b08b14c21..ddc84128b3c2e4c9be06129f1aecc04f196a3dab 100644 (file)
@@ -132,10 +132,11 @@ static int __devinit auxio_probe(struct of_device *dev, const struct of_device_i
 }
 
 static struct of_platform_driver auxio_driver = {
-       .match_table    = auxio_match,
        .probe          = auxio_probe,
-       .driver         = {
-               .name   = "auxio",
+       .driver = {
+               .name = "auxio",
+               .owner = THIS_MODULE,
+               .of_match_table = auxio_match,
        },
 };
 
index d533f3d5d48491d3ff619f65a74d73e0e98eb88d..434335f65823ec944626a9cbe0b9bbccb28bfd86 100644 (file)
@@ -149,10 +149,11 @@ static struct of_device_id __initdata clock_board_match[] = {
 };
 
 static struct of_platform_driver clock_board_driver = {
-       .match_table    = clock_board_match,
        .probe          = clock_board_probe,
-       .driver         = {
-               .name   = "clock_board",
+       .driver = {
+               .name = "clock_board",
+               .owner = THIS_MODULE,
+               .of_match_table = clock_board_match,
        },
 };
 
@@ -254,10 +255,11 @@ static struct of_device_id __initdata fhc_match[] = {
 };
 
 static struct of_platform_driver fhc_driver = {
-       .match_table    = fhc_match,
        .probe          = fhc_probe,
-       .driver         = {
-               .name   = "fhc",
+       .driver = {
+               .name = "fhc",
+               .owner = THIS_MODULE,
+               .of_match_table = fhc_match,
        },
 };
 
index 936879639eb64b95b1bcd223af4f91b9aaafa7c5..870cb65b3f216e38b81fc6932afe145067f6aec9 100644 (file)
@@ -811,8 +811,11 @@ static const struct of_device_id us3mc_match[] = {
 MODULE_DEVICE_TABLE(of, us3mc_match);
 
 static struct of_platform_driver us3mc_driver = {
-       .name           = "us3mc",
-       .match_table    = us3mc_match,
+       .driver = {
+               .name = "us3mc",
+               .owner = THIS_MODULE,
+               .of_match_table = us3mc_match,
+       },
        .probe          = us3mc_probe,
        .remove         = __devexit_p(us3mc_remove),
 };
index ff844baa28e67d6d6b61220abffe1b90cda7582a..51cfa09e392ab13f67862c11460e856235b6b9dc 100644 (file)
@@ -508,8 +508,11 @@ static struct of_device_id __initdata fire_match[] = {
 };
 
 static struct of_platform_driver fire_driver = {
-       .name           = DRIVER_NAME,
-       .match_table    = fire_match,
+       .driver = {
+               .name = DRIVER_NAME,
+               .owner = THIS_MODULE,
+               .of_match_table = fire_match,
+       },
        .probe          = fire_probe,
 };
 
index e675e21c6df6faf036af78a7e0a094a76512c642..558a70512824252d00e7e8c61396bc10b266c7a2 100644 (file)
@@ -602,8 +602,11 @@ static struct of_device_id __initdata psycho_match[] = {
 };
 
 static struct of_platform_driver psycho_driver = {
-       .name           = DRIVER_NAME,
-       .match_table    = psycho_match,
+       .driver = {
+               .name = DRIVER_NAME,
+               .owner = THIS_MODULE,
+               .of_match_table = psycho_match,
+       },
        .probe          = psycho_probe,
 };
 
index 5048498daade04bd864ec6500e7982be237ddaf1..6dad8e3b750666c433926d9a9d6963a42cc99de5 100644 (file)
@@ -596,8 +596,11 @@ static struct of_device_id __initdata sabre_match[] = {
 };
 
 static struct of_platform_driver sabre_driver = {
-       .name           = DRIVER_NAME,
-       .match_table    = sabre_match,
+       .driver = {
+               .name = DRIVER_NAME,
+               .owner = THIS_MODULE,
+               .of_match_table = sabre_match,
+       },
        .probe          = sabre_probe,
 };
 
index 2f3f9212b063eb48a6ae859ac3d411d88c3b33fb..97a1ae2e1c02ebee8bbcdd221254f80bb46b15b4 100644 (file)
@@ -1491,8 +1491,11 @@ static struct of_device_id __initdata schizo_match[] = {
 };
 
 static struct of_platform_driver schizo_driver = {
-       .name           = DRIVER_NAME,
-       .match_table    = schizo_match,
+       .driver = {
+               .name = DRIVER_NAME,
+               .owner = THIS_MODULE,
+               .of_match_table = schizo_match,
+       },
        .probe          = schizo_probe,
 };
 
index 5c11f56cedf8280e65303f1fc6903a95613a926b..a24af6f7e17f12b125f16d716690e02b663b5f88 100644 (file)
@@ -1009,8 +1009,11 @@ static struct of_device_id __initdata pci_sun4v_match[] = {
 };
 
 static struct of_platform_driver pci_sun4v_driver = {
-       .name           = DRIVER_NAME,
-       .match_table    = pci_sun4v_match,
+       .driver = {
+               .name = DRIVER_NAME,
+               .owner = THIS_MODULE,
+               .of_match_table = pci_sun4v_match,
+       },
        .probe          = pci_sun4v_probe,
 };
 
index 5e4563d86f191d39c2cf6ab386f233a13a877585..9589d8b9b0c17eb59f5d0d2d1b66a94ac3fd655e 100644 (file)
@@ -79,8 +79,11 @@ static struct of_device_id __initdata pmc_match[] = {
 MODULE_DEVICE_TABLE(of, pmc_match);
 
 static struct of_platform_driver pmc_driver = {
-       .name           = "pmc",
-       .match_table    = pmc_match,
+       .driver = {
+               .name = "pmc",
+               .owner = THIS_MODULE,
+               .of_match_table = pmc_match,
+       },
        .probe          = pmc_probe,
 };
 
index e3f806a7423b7a5bea68bda4990b228009cec72d..168d4cb63f5b34e110f021769adb1f199bee9a1e 100644 (file)
@@ -60,10 +60,11 @@ static struct of_device_id __initdata power_match[] = {
 };
 
 static struct of_platform_driver power_driver = {
-       .match_table    = power_match,
        .probe          = power_probe,
-       .driver         = {
-               .name   = "power",
+       .driver = {
+               .name = "power",
+               .owner = THIS_MODULE,
+               .of_match_table = power_match,
        },
 };
 
index e0dbed9503d40ed4e85bfc140838c71bd497327d..217ba275cabf7b8cde532c7fa2c82ce36d0393d0 100644 (file)
@@ -185,10 +185,11 @@ static struct of_device_id __initdata clock_match[] = {
 };
 
 static struct of_platform_driver clock_driver = {
-       .match_table    = clock_match,
        .probe          = clock_probe,
-       .driver         = {
-               .name   = "rtc",
+       .driver = {
+               .name = "rtc",
+               .owner = THIS_MODULE,
+               .of_match_table = clock_match,
        },
 };
 
index 9099ca0956415a397dee300f349066adb03d5b87..21e9fcae0668cdb7994ca856b428fa4a7a74b6e1 100644 (file)
@@ -463,10 +463,11 @@ static struct of_device_id __initdata rtc_match[] = {
 };
 
 static struct of_platform_driver rtc_driver = {
-       .match_table    = rtc_match,
        .probe          = rtc_probe,
-       .driver         = {
-               .name   = "rtc",
+       .driver = {
+               .name = "rtc",
+               .owner = THIS_MODULE,
+               .of_match_table = rtc_match,
        },
 };
 
@@ -495,10 +496,11 @@ static struct of_device_id __initdata bq4802_match[] = {
 };
 
 static struct of_platform_driver bq4802_driver = {
-       .match_table    = bq4802_match,
        .probe          = bq4802_probe,
-       .driver         = {
-               .name   = "bq4802",
+       .driver = {
+               .name = "bq4802",
+               .owner = THIS_MODULE,
+               .of_match_table = bq4802_match,
        },
 };
 
@@ -558,10 +560,11 @@ static struct of_device_id __initdata mostek_match[] = {
 };
 
 static struct of_platform_driver mostek_driver = {
-       .match_table    = mostek_match,
        .probe          = mostek_probe,
-       .driver         = {
-               .name   = "mostek",
+       .driver = {
+               .name = "mostek",
+               .owner = THIS_MODULE,
+               .of_match_table = mostek_match,
        },
 };
 
index 4cce719add3f296c20d7563de7412f963f28308c..88e6b6008bd6291a9802819f471984cc8c0c666b 100644 (file)
@@ -884,9 +884,6 @@ static struct of_device_id mpc52xx_ata_of_match[] = {
 
 
 static struct of_platform_driver mpc52xx_ata_of_platform_driver = {
-       .owner          = THIS_MODULE,
-       .name           = DRV_NAME,
-       .match_table    = mpc52xx_ata_of_match,
        .probe          = mpc52xx_ata_probe,
        .remove         = mpc52xx_ata_remove,
 #ifdef CONFIG_PM
@@ -896,6 +893,7 @@ static struct of_platform_driver mpc52xx_ata_of_platform_driver = {
        .driver         = {
                .name   = DRV_NAME,
                .owner  = THIS_MODULE,
+               .of_match_table = mpc52xx_ata_of_match,
        },
 };
 
index 19da29f011db03916bba5f2667d991b3cfa04314..5a1b82c08be950b3b359c203c6654f342dde57c2 100644 (file)
@@ -91,8 +91,11 @@ static struct of_device_id pata_of_platform_match[] = {
 MODULE_DEVICE_TABLE(of, pata_of_platform_match);
 
 static struct of_platform_driver pata_of_platform_driver = {
-       .name           = "pata_of_platform",
-       .match_table    = pata_of_platform_match,
+       .driver = {
+               .name = "pata_of_platform",
+               .owner = THIS_MODULE,
+               .of_match_table = pata_of_platform_match,
+       },
        .probe          = pata_of_platform_probe,
        .remove         = __devexit_p(pata_of_platform_remove),
 };
index e3339e25b152b222490386f9ea3f480f8439a209..61c89b54ea23941fd937a25ec4228eca56648e10 100644 (file)
@@ -1427,8 +1427,11 @@ static struct of_device_id fsl_sata_match[] = {
 MODULE_DEVICE_TABLE(of, fsl_sata_match);
 
 static struct of_platform_driver fsl_sata_driver = {
-       .name           = "fsl-sata",
-       .match_table    = fsl_sata_match,
+       .driver = {
+               .name = "fsl-sata",
+               .owner = THIS_MODULE,
+               .of_match_table = fsl_sata_match,
+       },
        .probe          = sata_fsl_probe,
        .remove         = sata_fsl_remove,
 #ifdef CONFIG_PM
index 593a03a376e4b2adb7bda0d8292c5ab85964df93..da8f176c051e19e164b0fdc362b3ba77d3e89738 100644 (file)
@@ -2695,8 +2695,11 @@ static const struct of_device_id fore200e_sba_match[] = {
 MODULE_DEVICE_TABLE(of, fore200e_sba_match);
 
 static struct of_platform_driver fore200e_sba_driver = {
-       .name           = "fore_200e",
-       .match_table    = fore200e_sba_match,
+       .driver = {
+               .name = "fore_200e",
+               .owner = THIS_MODULE,
+               .of_match_table = fore200e_sba_match,
+       },
        .probe          = fore200e_sba_probe,
        .remove         = __devexit_p(fore200e_sba_remove),
 };
index 3094909b0613394bf2f6506be70148b240ebb280..a7b83c0a7eb5575ded978fd7a2e89025d829057d 100644 (file)
@@ -1237,13 +1237,12 @@ static const struct of_device_id ace_of_match[] __devinitconst = {
 MODULE_DEVICE_TABLE(of, ace_of_match);
 
 static struct of_platform_driver ace_of_driver = {
-       .owner = THIS_MODULE,
-       .name = "xsysace",
-       .match_table = ace_of_match,
        .probe = ace_of_probe,
        .remove = __devexit_p(ace_of_remove),
        .driver = {
                .name = "xsysace",
+               .owner = THIS_MODULE,
+               .of_match_table = ace_of_match,
        },
 };
 
index 0861d99cd75bcba8fc063e52dc4a960a751ede91..0f9cbf1aaf15963bf1acda06f52de1d33836b990 100644 (file)
@@ -751,8 +751,11 @@ static const struct of_device_id n2rng_match[] = {
 MODULE_DEVICE_TABLE(of, n2rng_match);
 
 static struct of_platform_driver n2rng_driver = {
-       .name           = "n2rng",
-       .match_table    = n2rng_match,
+       .driver = {
+               .name = "n2rng",
+               .owner = THIS_MODULE,
+               .of_match_table = n2rng_match,
+       },
        .probe          = n2rng_probe,
        .remove         = __devexit_p(n2rng_remove),
 };
index b213855bae68af5e6515fa12d28a4ce26ca1f27f..261ba8f22b8ba57872d4b15f1f71b5da05b009bd 100644 (file)
@@ -140,8 +140,11 @@ static struct of_device_id rng_match[] = {
 };
 
 static struct of_platform_driver rng_driver = {
-       .name           = "pasemi-rng",
-       .match_table    = rng_match,
+       .driver = {
+               .name = "pasemi-rng",
+               .owner = THIS_MODULE,
+               .of_match_table = rng_match,
+       },
        .probe          = rng_probe,
        .remove         = rng_remove,
 };
index 2b44a0e1b9883761e3253f7d7d15ffa15d9bca1f..47ffe4a90a95d0372cb178c893ed3e92128d135b 100644 (file)
@@ -2555,8 +2555,11 @@ static struct of_device_id ipmi_match[] =
 };
 
 static struct of_platform_driver ipmi_of_platform_driver = {
-       .name           = "ipmi",
-       .match_table    = ipmi_match,
+       .driver = {
+               .name = "ipmi",
+               .owner = THIS_MODULE,
+               .of_match_table = ipmi_match,
+       },
        .probe          = ipmi_of_probe,
        .remove         = __devexit_p(ipmi_of_remove),
 };
index 5a0a31e2029cd851c97489031db62aa1ef2d4ca4..ed8a9cec2a05ebefc7b171828bd08b2b6a677e1c 100644 (file)
@@ -812,13 +812,12 @@ static const struct of_device_id __devinitconst hwicap_of_match[] = {
 MODULE_DEVICE_TABLE(of, hwicap_of_match);
 
 static struct of_platform_driver hwicap_of_driver = {
-       .owner = THIS_MODULE,
-       .name = DRIVER_NAME,
-       .match_table = hwicap_of_match,
        .probe = hwicap_of_probe,
        .remove = __devexit_p(hwicap_of_remove),
        .driver = {
                .name = DRIVER_NAME,
+               .owner = THIS_MODULE,
+               .of_match_table = hwicap_of_match,
        },
 };
 
index 6c4c8b7ce3aa195e5dac4e05f7db38c6051a783b..9d65b371de64cced72bcb0f1e483913962277552 100644 (file)
@@ -1281,8 +1281,11 @@ static const struct of_device_id crypto4xx_match[] = {
 };
 
 static struct of_platform_driver crypto4xx_driver = {
-       .name           = "crypto4xx",
-       .match_table    = crypto4xx_match,
+       .driver = {
+               .name = "crypto4xx",
+               .owner = THIS_MODULE,
+               .of_match_table = crypto4xx_match,
+       },
        .probe          = crypto4xx_probe,
        .remove         = crypto4xx_remove,
 };
index 5a02f3482dba5ba96b227f9ac944bec680207706..7e4e42d85fe48ef4e7cc611fb9f3bec5d7162b3f 100644 (file)
@@ -1968,8 +1968,11 @@ static const struct of_device_id talitos_match[] = {
 MODULE_DEVICE_TABLE(of, talitos_match);
 
 static struct of_platform_driver talitos_driver = {
-       .name = "talitos",
-       .match_table = talitos_match,
+       .driver = {
+               .name = "talitos",
+               .owner = THIS_MODULE,
+               .of_match_table = talitos_match,
+       },
        .probe = talitos_probe,
        .remove = talitos_remove,
 };
index 0e376eb3741757180539646f96b30bb4de50c4db..c3d74697f5a904aad4d7944f592f0a5a456959cf 100644 (file)
@@ -1409,10 +1409,13 @@ static const struct of_device_id fsldma_of_ids[] = {
 };
 
 static struct of_platform_driver fsldma_of_driver = {
-       .name           = "fsl-elo-dma",
-       .match_table    = fsldma_of_ids,
-       .probe          = fsldma_of_probe,
-       .remove         = fsldma_of_remove,
+       .driver = {
+               .name = "fsl-elo-dma",
+               .owner = THIS_MODULE,
+               .of_match_table = fsldma_of_ids,
+       },
+       .probe = fsldma_of_probe,
+       .remove = fsldma_of_remove,
 };
 
 /*----------------------------------------------------------------------------*/
index d44626fa35ad08c14c3cb3c6f7a8eb91b655b5b6..a7b05447e0abe5148b2a3e23c77b749e0b537d9f 100644 (file)
@@ -4949,12 +4949,12 @@ static const struct of_device_id ppc440spe_adma_of_match[] __devinitconst = {
 MODULE_DEVICE_TABLE(of, ppc440spe_adma_of_match);
 
 static struct of_platform_driver ppc440spe_adma_driver = {
-       .match_table = ppc440spe_adma_of_match,
        .probe = ppc440spe_adma_probe,
        .remove = __devexit_p(ppc440spe_adma_remove),
        .driver = {
                .name = "PPC440SP(E)-ADMA",
                .owner = THIS_MODULE,
+               .of_match_table = ppc440spe_adma_of_match,
        },
 };
 
index 4471647b4807eadb31b6e4e278a5298bcfed97e8..6c1886b497ff673add09b99809f065c9a294090b 100644 (file)
@@ -338,15 +338,13 @@ static struct of_device_id mpc85xx_pci_err_of_match[] = {
 };
 
 static struct of_platform_driver mpc85xx_pci_err_driver = {
-       .owner = THIS_MODULE,
-       .name = "mpc85xx_pci_err",
-       .match_table = mpc85xx_pci_err_of_match,
        .probe = mpc85xx_pci_err_probe,
        .remove = __devexit_p(mpc85xx_pci_err_remove),
        .driver = {
-                  .name = "mpc85xx_pci_err",
-                  .owner = THIS_MODULE,
-                  },
+               .name = "mpc85xx_pci_err",
+               .owner = THIS_MODULE,
+               .of_match_table = mpc85xx_pci_err_of_match,
+       },
 };
 
 #endif                         /* CONFIG_PCI */
@@ -654,15 +652,13 @@ static struct of_device_id mpc85xx_l2_err_of_match[] = {
 };
 
 static struct of_platform_driver mpc85xx_l2_err_driver = {
-       .owner = THIS_MODULE,
-       .name = "mpc85xx_l2_err",
-       .match_table = mpc85xx_l2_err_of_match,
        .probe = mpc85xx_l2_err_probe,
        .remove = mpc85xx_l2_err_remove,
        .driver = {
-                  .name = "mpc85xx_l2_err",
-                  .owner = THIS_MODULE,
-                  },
+               .name = "mpc85xx_l2_err",
+               .owner = THIS_MODULE,
+               .of_match_table = mpc85xx_l2_err_of_match,
+       },
 };
 
 /**************************** MC Err device ***************************/
@@ -1131,15 +1127,13 @@ static struct of_device_id mpc85xx_mc_err_of_match[] = {
 };
 
 static struct of_platform_driver mpc85xx_mc_err_driver = {
-       .owner = THIS_MODULE,
-       .name = "mpc85xx_mc_err",
-       .match_table = mpc85xx_mc_err_of_match,
        .probe = mpc85xx_mc_err_probe,
        .remove = mpc85xx_mc_err_remove,
        .driver = {
-                  .name = "mpc85xx_mc_err",
-                  .owner = THIS_MODULE,
-                  },
+               .name = "mpc85xx_mc_err",
+               .owner = THIS_MODULE,
+               .of_match_table = mpc85xx_mc_err_of_match,
+       },
 };
 
 #ifdef CONFIG_MPC85xx
index 11f2172aa1e6f5fb37dbe4752ec2654dc7c5d5df..9d6f6783328c80357cb794614ff79dca1e0b84d0 100644 (file)
@@ -202,13 +202,13 @@ static struct of_device_id ppc4xx_edac_match[] = {
 };
 
 static struct of_platform_driver ppc4xx_edac_driver = {
-       .match_table            = ppc4xx_edac_match,
        .probe                  = ppc4xx_edac_probe,
        .remove                 = ppc4xx_edac_remove,
-       .driver                 = {
-               .owner  = THIS_MODULE,
-               .name   = PPC4XX_EDAC_MODULE_NAME
-       }
+       .driver = {
+               .owner = THIS_MODULE,
+               .name = PPC4XX_EDAC_MODULE_NAME
+               .of_match_table = ppc4xx_edac_match,
+       },
 };
 
 /*
index 68e90abeba966e93a55d8b216fce1d73e2d27db7..5da5942cf970763be13b716c5bd2a3c10d1af3ab 100644 (file)
@@ -300,8 +300,11 @@ static const struct of_device_id env_match[] = {
 MODULE_DEVICE_TABLE(of, env_match);
 
 static struct of_platform_driver env_driver = {
-       .name           = "ultra45_env",
-       .match_table    = env_match,
+       .driver = {
+               .name = "ultra45_env",
+               .owner = THIS_MODULE,
+               .of_match_table = env_match,
+       },
        .probe          = env_probe,
        .remove         = __devexit_p(env_remove),
 };
index 48d2c1a0d4ce8c6820a28f2f1dfd22d049e4f0fe..7637e123414292459846142d49c7f994cc58add2 100644 (file)
@@ -718,13 +718,13 @@ static const struct of_device_id cpm_i2c_match[] = {
 MODULE_DEVICE_TABLE(of, cpm_i2c_match);
 
 static struct of_platform_driver cpm_i2c_driver = {
-       .match_table    = cpm_i2c_match,
        .probe          = cpm_i2c_probe,
        .remove         = __devexit_p(cpm_i2c_remove),
-       .driver         = {
-               .name   = "fsl-i2c-cpm",
-               .owner  = THIS_MODULE,
-       }
+       .driver = {
+               .name = "fsl-i2c-cpm",
+               .owner = THIS_MODULE,
+               .of_match_table = cpm_i2c_match,
+       },
 };
 
 static int __init cpm_i2c_init(void)
index e66dc83953c5da4be772632d27e7a3ade7449e71..3876f993fe764e956b928b01b39e3c4eda5c55e1 100644 (file)
@@ -807,8 +807,11 @@ static const struct of_device_id ibm_iic_match[] = {
 };
 
 static struct of_platform_driver ibm_iic_driver = {
-       .name   = "ibm-iic",
-       .match_table = ibm_iic_match,
+       .driver = {
+               .name = "ibm-iic",
+               .owner = THIS_MODULE,
+               .of_match_table = ibm_iic_match,
+       },
        .probe  = iic_probe,
        .remove = __devexit_p(iic_remove),
 };
index 69473b6c260c66be8bf418d5fdb81e696a398de0..791b71f46f7b2ef293c7d16fd783997c26fcd829 100644 (file)
@@ -675,12 +675,12 @@ MODULE_DEVICE_TABLE(of, mpc_i2c_of_match);
 
 /* Structure for a device driver */
 static struct of_platform_driver mpc_i2c_driver = {
-       .match_table    = mpc_i2c_of_match,
        .probe          = fsl_i2c_probe,
        .remove         = __devexit_p(fsl_i2c_remove),
-       .driver         = {
-               .owner  = THIS_MODULE,
-               .name   = DRV_NAME,
+       .driver = {
+               .owner = THIS_MODULE,
+               .name = DRV_NAME,
+               .of_match_table = mpc_i2c_of_match,
        },
 };
 
index 26391853277fee720b3902a3df2f983269d55dd1..252489e883690590db3999e3b76c6336e5122893 100644 (file)
@@ -937,12 +937,13 @@ static struct of_device_id ehca_device_table[] =
 MODULE_DEVICE_TABLE(of, ehca_device_table);
 
 static struct of_platform_driver ehca_driver = {
-       .name        = "ehca",
-       .match_table = ehca_device_table,
        .probe       = ehca_probe,
        .remove      = ehca_remove,
-       .driver      = {
+       .driver = {
+               .name = "ehca",
+               .owner = THIS_MODULE,
                .groups = ehca_drv_attr_groups,
+               .of_match_table = ehca_device_table,
        },
 };
 
index 0d45422f8095040f9354b3fe40d4a520218e7c88..1dacae4b43f0f32671e42934919526c5502a4dcf 100644 (file)
@@ -259,8 +259,11 @@ static const struct of_device_id bbc_beep_match[] = {
 };
 
 static struct of_platform_driver bbc_beep_driver = {
-       .name           = "bbcbeep",
-       .match_table    = bbc_beep_match,
+       .driver = {
+               .name = "bbcbeep",
+               .owner = THIS_MODULE,
+               .of_match_table = bbc_beep_match,
+       },
        .probe          = bbc_beep_probe,
        .remove         = __devexit_p(bbc_remove),
        .shutdown       = sparcspkr_shutdown,
@@ -338,8 +341,11 @@ static const struct of_device_id grover_beep_match[] = {
 };
 
 static struct of_platform_driver grover_beep_driver = {
-       .name           = "groverbeep",
-       .match_table    = grover_beep_match,
+       .driver = {
+               .name = "groverbeep",
+               .owner = THIS_MODULE,
+               .of_match_table = grover_beep_match,
+       },
        .probe          = grover_beep_probe,
        .remove         = __devexit_p(grover_remove),
        .shutdown       = sparcspkr_shutdown,
index 29e17698b2a4beed1a789e6b474a29afd30305d0..04e32f2d1241eacc9cfc6716fb22441d2dbd2a3e 100644 (file)
@@ -96,8 +96,11 @@ static const struct of_device_id sparc_i8042_match[] = {
 MODULE_DEVICE_TABLE(of, sparc_i8042_match);
 
 static struct of_platform_driver sparc_i8042_driver = {
-       .name           = "i8042",
-       .match_table    = sparc_i8042_match,
+       .driver = {
+               .name = "i8042",
+               .owner = THIS_MODULE,
+               .of_match_table = sparc_i8042_match,
+       },
        .probe          = sparc_i8042_probe,
        .remove         = __devexit_p(sparc_i8042_remove),
 };
index 7a288c0ef1a6e45a52ec961bea6a67118b491a07..e2c028d2638fce0e49d41912f91f1a3260cb16a0 100644 (file)
@@ -362,8 +362,11 @@ static const struct of_device_id xps2_of_match[] __devinitconst = {
 MODULE_DEVICE_TABLE(of, xps2_of_match);
 
 static struct of_platform_driver xps2_of_driver = {
-       .name           = DRIVER_NAME,
-       .match_table    = xps2_of_match,
+       .driver = {
+               .name = DRIVER_NAME,
+               .owner = THIS_MODULE,
+               .of_match_table = xps2_of_match,
+       },
        .probe          = xps2_of_probe,
        .remove         = __devexit_p(xps2_of_remove),
 };
index a77a23e783db5cdb8f565bc75d2e52b646332b69..6d94b0b9979c581e369e4b54b51fc8244113d0bf 100644 (file)
@@ -291,8 +291,8 @@ static struct of_platform_driver of_gpio_leds_driver = {
        .driver = {
                .name = "of_gpio_leds",
                .owner = THIS_MODULE,
+               .of_match_table = of_gpio_leds_match,
        },
-       .match_table = of_gpio_leds_match,
        .probe = of_gpio_leds_probe,
        .remove = __devexit_p(of_gpio_leds_remove),
 };
index 888448cf7f1f1fedf4af2212ca242f06f88d04f7..ef1f3330a10e82e901d1613fac6fca29cfa5b26e 100644 (file)
@@ -671,8 +671,11 @@ static const struct of_device_id smu_platform_match[] =
 
 static struct of_platform_driver smu_of_platform_driver =
 {
-       .name           = "smu",
-       .match_table    = smu_platform_match,
+       .driver = {
+               .name = "smu",
+               .owner = THIS_MODULE,
+               .of_match_table = smu_platform_match,
+       },
        .probe          = smu_platform_probe,
 };
 
index 9314be9a2fc846ca1be4940624e53a3b17b051de..e60605bd0ea980a5928d0349df3fdb29eb09bb0c 100644 (file)
@@ -2238,8 +2238,11 @@ static const struct of_device_id fcu_match[] =
 
 static struct of_platform_driver fcu_of_platform_driver = 
 {
-       .name           = "temperature",
-       .match_table    = fcu_match,
+       .driver = {
+               .name = "temperature",
+               .owner = THIS_MODULE,
+               .of_match_table = fcu_match,
+       },
        .probe          = fcu_of_probe,
        .remove         = fcu_of_remove
 };
index 0839770e4ec54faa6c742c4c7f06ac81fecb7080..5c9367acf0cf2c6a3411fe691f12540caab7ffd7 100644 (file)
@@ -463,8 +463,11 @@ static const struct of_device_id therm_of_match[] = {{
 };
 
 static struct of_platform_driver therm_of_driver = {
-       .name           = "temperature",
-       .match_table    = therm_of_match,
+       .driver = {
+               .name = "temperature",
+               .owner = THIS_MODULE,
+               .of_match_table = therm_of_match,
+       },
        .probe          = therm_of_probe,
        .remove         = therm_of_remove,
 };
index dfe5ceae6794c09392bba1ab8f19f1c54241e25e..7802a543d8fcec497e451b5072510d4c58163c53 100644 (file)
@@ -205,8 +205,11 @@ static const struct of_device_id sdhci_of_match[] = {
 MODULE_DEVICE_TABLE(of, sdhci_of_match);
 
 static struct of_platform_driver sdhci_of_driver = {
-       .driver.name = "sdhci-of",
-       .match_table = sdhci_of_match,
+       .driver = {
+               .name = "sdhci-of",
+               .owner = THIS_MODULE,
+               .of_match_table = sdhci_of_match,
+       },
        .probe = sdhci_of_probe,
        .remove = __devexit_p(sdhci_of_remove),
        .suspend = sdhci_of_suspend,
index 3dc7a2fbf025133c274bdda7a13f80ff538344c3..4147fe328c556e7915fb46df7988d7d9a2ff2393 100644 (file)
@@ -375,8 +375,11 @@ static struct of_device_id of_flash_match[] = {
 MODULE_DEVICE_TABLE(of, of_flash_match);
 
 static struct of_platform_driver of_flash_driver = {
-       .name           = "of-flash",
-       .match_table    = of_flash_match,
+       .driver = {
+               .name = "of-flash",
+               .owner = THIS_MODULE,
+               .of_match_table = of_flash_match,
+       },
        .probe          = of_flash_probe,
        .remove         = of_flash_remove,
 };
index 5945a23e681f5d33eb8b357e5174b66282be06cf..0391c2527bd77ac075bf3a2fbc694b49cc5af939 100644 (file)
@@ -149,8 +149,11 @@ static const struct of_device_id uflash_match[] = {
 MODULE_DEVICE_TABLE(of, uflash_match);
 
 static struct of_platform_driver uflash_driver = {
-       .name           = DRIVER_NAME,
-       .match_table    = uflash_match,
+       .driver = {
+               .name = DRIVER_NAME,
+               .owner = THIS_MODULE,
+               .of_match_table = uflash_match,
+       },
        .probe          = uflash_probe,
        .remove         = __devexit_p(uflash_remove),
 };
index 4a6079588ab2f0555156321e3bbe6541e572b436..f45a8d0c1508640e26f6bce6480029778d81d39c 100644 (file)
@@ -1078,9 +1078,10 @@ static const struct of_device_id fsl_elbc_match[] = {
 
 static struct of_platform_driver fsl_elbc_ctrl_driver = {
        .driver = {
-               .name   = "fsl-elbc",
+               .name = "fsl-elbc",
+               .owner = THIS_MODULE,
+               .of_match_table = fsl_elbc_match,
        },
-       .match_table = fsl_elbc_match,
        .probe = fsl_elbc_ctrl_probe,
        .remove = fsl_elbc_ctrl_remove,
 };
index 4b96296af321e5d5e0dba823b1e1ed7568943279..b7ab5a0ec35d4d3db7515de2985d1bc73ccc8882 100644 (file)
@@ -357,8 +357,11 @@ static struct of_device_id of_fun_match[] = {
 MODULE_DEVICE_TABLE(of, of_fun_match);
 
 static struct of_platform_driver of_fun_driver = {
-       .name           = "fsl,upm-nand",
-       .match_table    = of_fun_match,
+       .driver = {
+               .name = "fsl,upm-nand",
+               .owner = THIS_MODULE,
+               .of_match_table = of_fun_match,
+       },
        .probe          = fun_probe,
        .remove         = __devexit_p(fun_remove),
 };
index c0e05f5ff8a4ed8c58b284a9f794675455f00a20..98fd2bdf8be15df36be2dd264e56ea27282bd20b 100644 (file)
@@ -294,9 +294,10 @@ MODULE_DEVICE_TABLE(of, ndfc_match);
 
 static struct of_platform_driver ndfc_driver = {
        .driver = {
-               .name   = "ndfc",
+               .name = "ndfc",
+               .owner = THIS_MODULE,
+               .of_match_table = ndfc_match,
        },
-       .match_table = ndfc_match,
        .probe = ndfc_probe,
        .remove = __devexit_p(ndfc_remove),
 };
index edfc27b78513cfddde78e21f5f3b90166a1311d0..a97e9c95ab6a94427ee6d55cf03204ede1dd7a70 100644 (file)
@@ -221,8 +221,11 @@ MODULE_DEVICE_TABLE(of, pasemi_nand_match);
 
 static struct of_platform_driver pasemi_nand_driver =
 {
-       .name           = (char*)driver_name,
-       .match_table    = pasemi_nand_match,
+       .driver = {
+               .name = (char*)driver_name,
+               .owner = THIS_MODULE,
+               .of_match_table = pasemi_nand_match,
+       },
        .probe          = pasemi_nand_probe,
        .remove         = pasemi_nand_remove,
 };
index a4519a7bd68356c20954de2d809767ccd6d5c559..edb9b138414343fdf4fbe98709e06a093c402e79 100644 (file)
@@ -301,8 +301,11 @@ static struct of_device_id socrates_nand_match[] =
 MODULE_DEVICE_TABLE(of, socrates_nand_match);
 
 static struct of_platform_driver socrates_nand_driver = {
-       .name           = "socrates_nand",
-       .match_table    = socrates_nand_match,
+       .driver = {
+               .name = "socrates_nand",
+               .owner = THIS_MODULE,
+               .of_match_table = socrates_nand_match,
+       },
        .probe          = socrates_nand_probe,
        .remove         = __devexit_p(socrates_nand_remove),
 };
index 03e7c48465a212bd8b5ca17f248ff27e2f58051f..2120784f8db4574a7613521bffa97c86cea38233 100644 (file)
@@ -393,15 +393,17 @@ static struct of_device_id __devinitdata mpc5xxx_can_table[] = {
 };
 
 static struct of_platform_driver mpc5xxx_can_driver = {
-       .owner = THIS_MODULE,
-       .name = "mpc5xxx_can",
+       .driver = {
+               .name = "mpc5xxx_can",
+               .owner = THIS_MODULE,
+               .of_match_table = mpc5xxx_can_table,
+       },
        .probe = mpc5xxx_can_probe,
        .remove = __devexit_p(mpc5xxx_can_remove),
 #ifdef CONFIG_PM
        .suspend = mpc5xxx_can_suspend,
        .resume = mpc5xxx_can_resume,
 #endif
-       .match_table = mpc5xxx_can_table,
 };
 
 static int __init mpc5xxx_can_init(void)
index dc5f20cdf93cca0e77b9ed97347008466c067902..158b76ebf3eaf527e20ae861b8cdef32d8041a23 100644 (file)
@@ -216,11 +216,13 @@ static struct of_device_id __devinitdata sja1000_ofp_table[] = {
 MODULE_DEVICE_TABLE(of, sja1000_ofp_table);
 
 static struct of_platform_driver sja1000_ofp_driver = {
-       .owner = THIS_MODULE,
-       .name = DRV_NAME,
+       .driver = {
+               .owner = THIS_MODULE,
+               .name = DRV_NAME,
+               .of_match_table = sja1000_ofp_table,
+       },
        .probe = sja1000_ofp_probe,
        .remove = __devexit_p(sja1000_ofp_remove),
-       .match_table = sja1000_ofp_table,
 };
 
 static int __init sja1000_ofp_init(void)
index 59dac232006c1067f3f685dd0dac03cbc9b927b9..b23173864c60e9c25c2268a071a09e30ba842627 100644 (file)
@@ -122,8 +122,11 @@ static struct of_device_id ehea_device_table[] = {
 MODULE_DEVICE_TABLE(of, ehea_device_table);
 
 static struct of_platform_driver ehea_driver = {
-       .name = "ehea",
-       .match_table = ehea_device_table,
+       .driver = {
+               .name = "ehea",
+               .owner = THIS_MODULE,
+               .of_match_table = ehea_device_table,
+       },
        .probe = ehea_probe_adapter,
        .remove = ehea_remove,
 };
index 3342056f8aac252d8d20b589ce3fa51616c3365a..be540b67ea57d3a3fb698c55d772d86f6c2a9f20 100644 (file)
@@ -1065,9 +1065,11 @@ static struct of_device_id mpc52xx_fec_match[] = {
 MODULE_DEVICE_TABLE(of, mpc52xx_fec_match);
 
 static struct of_platform_driver mpc52xx_fec_driver = {
-       .owner          = THIS_MODULE,
-       .name           = DRIVER_NAME,
-       .match_table    = mpc52xx_fec_match,
+       .driver = {
+               .name = DRIVER_NAME,
+               .owner = THIS_MODULE,
+               .of_match_table = mpc52xx_fec_match,
+       },
        .probe          = mpc52xx_fec_probe,
        .remove         = mpc52xx_fec_remove,
 #ifdef CONFIG_PM
index 0d099e5a652d80bfb980afad567ba5f31576e977..006f64d9f96a695e6fbde63b0269121da323df0b 100644 (file)
@@ -159,10 +159,13 @@ static struct of_device_id mpc52xx_fec_mdio_match[] = {
 MODULE_DEVICE_TABLE(of, mpc52xx_fec_mdio_match);
 
 struct of_platform_driver mpc52xx_fec_mdio_driver = {
-       .name = "mpc5200b-fec-phy",
+       .driver = {
+               .name = "mpc5200b-fec-phy",
+               .owner = THIS_MODULE,
+               .of_match_table = mpc52xx_fec_mdio_match,
+       },
        .probe = mpc52xx_fec_mdio_probe,
        .remove = mpc52xx_fec_mdio_remove,
-       .match_table = mpc52xx_fec_mdio_match,
 };
 
 /* let fec driver call it, since this has to be registered before it */
index caeb88b67bc67c9547e9144ae91609de0aad5740..cae2d16858d19fd4f82dd5cc23a0f0f99872e160 100644 (file)
@@ -1158,8 +1158,11 @@ static struct of_device_id fs_enet_match[] = {
 MODULE_DEVICE_TABLE(of, fs_enet_match);
 
 static struct of_platform_driver fs_enet_driver = {
-       .name   = "fs_enet",
-       .match_table = fs_enet_match,
+       .driver = {
+               .owner = THIS_MODULE,
+               .name = "fs_enet",
+               .of_match_table = fs_enet_match,
+       },
        .probe = fs_enet_probe,
        .remove = fs_enet_remove,
 };
index 24ff9f43a62b4e6378da3f231b280e75258bfce9..0f90685d3d19472e3bc0dc9b05ed5872a5fa9f63 100644 (file)
@@ -224,8 +224,11 @@ static struct of_device_id fs_enet_mdio_bb_match[] = {
 MODULE_DEVICE_TABLE(of, fs_enet_mdio_bb_match);
 
 static struct of_platform_driver fs_enet_bb_mdio_driver = {
-       .name = "fsl-bb-mdio",
-       .match_table = fs_enet_mdio_bb_match,
+       .driver = {
+               .name = "fsl-bb-mdio",
+               .owner = THIS_MODULE,
+               .of_match_table = fs_enet_mdio_bb_match,
+       },
        .probe = fs_enet_mdio_probe,
        .remove = fs_enet_mdio_remove,
 };
index dc862e779c1f7c0c767fe575e2029504c75c544a..bddffd169b93888cfab8d97f05de9136063a81cb 100644 (file)
@@ -222,8 +222,11 @@ static struct of_device_id fs_enet_mdio_fec_match[] = {
 MODULE_DEVICE_TABLE(of, fs_enet_mdio_fec_match);
 
 static struct of_platform_driver fs_enet_fec_mdio_driver = {
-       .name = "fsl-fec-mdio",
-       .match_table = fs_enet_mdio_fec_match,
+       .driver = {
+               .name = "fsl-fec-mdio",
+               .owner = THIS_MODULE,
+               .of_match_table = fs_enet_mdio_fec_match,
+       },
        .probe = fs_enet_mdio_probe,
        .remove = fs_enet_mdio_remove,
 };
index 72489a213bf7241a00319ceae656e22fcb55512b..16508535720a9da18523cf1eddc52c0327e47daf 100644 (file)
@@ -461,10 +461,13 @@ static struct of_device_id fsl_pq_mdio_match[] = {
 MODULE_DEVICE_TABLE(of, fsl_pq_mdio_match);
 
 static struct of_platform_driver fsl_pq_mdio_driver = {
-       .name = "fsl-pq_mdio",
+       .driver = {
+               .name = "fsl-pq_mdio",
+               .owner = THIS_MODULE,
+               .of_match_table = fsl_pq_mdio_match,
+       },
        .probe = fsl_pq_mdio_probe,
        .remove = fsl_pq_mdio_remove,
-       .match_table = fsl_pq_mdio_match,
 };
 
 int __init fsl_pq_mdio_init(void)
index b71bba91064c756ab5ecc379c01209f5be44d2aa..c3b292a31328eac3b5ed11e4f91ad478b6fbf51f 100644 (file)
@@ -3054,14 +3054,16 @@ MODULE_DEVICE_TABLE(of, gfar_match);
 
 /* Structure for a device driver */
 static struct of_platform_driver gfar_driver = {
-       .name = "fsl-gianfar",
-       .match_table = gfar_match,
-
+       .driver = {
+               .name = "fsl-gianfar",
+               .owner = THIS_MODULE,
+               .pm = GFAR_PM_OPS,
+               .of_match_table = gfar_match,
+       },
        .probe = gfar_probe,
        .remove = gfar_remove,
        .suspend = gfar_legacy_suspend,
        .resume = gfar_legacy_resume,
-       .driver.pm = GFAR_PM_OPS,
 };
 
 static int __init gfar_init(void)
index cda2ba891344d018bc895ea0bc025096c0bbddb5..f8c36a5eb4d79c9d10af257d76faf361e336ce3d 100644 (file)
@@ -2996,9 +2996,11 @@ static struct of_device_id emac_match[] =
 MODULE_DEVICE_TABLE(of, emac_match);
 
 static struct of_platform_driver emac_driver = {
-       .name = "emac",
-       .match_table = emac_match,
-
+       .driver = {
+               .name = "emac",
+               .owner = THIS_MODULE,
+               .of_match_table = emac_match,
+       },
        .probe = emac_probe,
        .remove = emac_remove,
 };
index aba17947e208651dd560e81d7f40095d8cd13631..fcff9e0bd3827396546398c5f5feb2cc4269c90f 100644 (file)
@@ -790,9 +790,11 @@ static struct of_device_id mal_platform_match[] =
 };
 
 static struct of_platform_driver mal_of_driver = {
-       .name = "mcmal",
-       .match_table = mal_platform_match,
-
+       .driver = {
+               .name = "mcmal",
+               .owner = THIS_MODULE,
+               .of_match_table = mal_platform_match,
+       },
        .probe = mal_probe,
        .remove = mal_remove,
 };
index 6ab630a79e31af7187c33b2f848faccb90e8468d..108919bcdf137959d9bb2b5957607132ebabb407 100644 (file)
@@ -319,9 +319,11 @@ static struct of_device_id rgmii_match[] =
 };
 
 static struct of_platform_driver rgmii_driver = {
-       .name = "emac-rgmii",
-       .match_table = rgmii_match,
-
+       .driver = {
+               .name = "emac-rgmii",
+               .owner = THIS_MODULE,
+               .of_match_table = rgmii_match,
+       },
        .probe = rgmii_probe,
        .remove = rgmii_remove,
 };
index 4f64b00dd5e853e8119919a9c4cc2dae37b2aa03..044637144c4349b4291351fc38772b17f0355830 100644 (file)
@@ -166,9 +166,11 @@ static struct of_device_id tah_match[] =
 };
 
 static struct of_platform_driver tah_driver = {
-       .name = "emac-tah",
-       .match_table = tah_match,
-
+       .driver = {
+               .name = "emac-tah",
+               .owner = THIS_MODULE,
+               .of_match_table = tah_match,
+       },
        .probe = tah_probe,
        .remove = tah_remove,
 };
index b4fa823ed201a16a9ceeb29c79150bd18123f9c5..046dcd069c4556c2cddf68eb772577b3ca6e00ff 100644 (file)
@@ -313,9 +313,11 @@ static struct of_device_id zmii_match[] =
 };
 
 static struct of_platform_driver zmii_driver = {
-       .name = "emac-zmii",
-       .match_table = zmii_match,
-
+       .driver = {
+               .name = "emac-zmii",
+               .owner = THIS_MODULE,
+               .of_match_table = zmii_match,
+       },
        .probe = zmii_probe,
        .remove = zmii_remove,
 };
index 9c7395c10e4490fb280884edd0fec6851c2f4e60..dc318330ec79af1f9182d5bffbb7e7f72a0dc4c7 100644 (file)
@@ -955,12 +955,12 @@ static struct of_device_id temac_of_match[] __devinitdata = {
 MODULE_DEVICE_TABLE(of, temac_of_match);
 
 static struct of_platform_driver temac_of_driver = {
-       .match_table = temac_of_match,
        .probe = temac_of_probe,
        .remove = __devexit_p(temac_of_remove),
        .driver = {
                .owner = THIS_MODULE,
                .name = "xilinx_temac",
+               .of_match_table = temac_of_match,
        },
 };
 
index e21439f1e775784b0c6e0522af666b71ab53f99d..77835df4d013a113847133565b9589e6caa9e147 100644 (file)
@@ -1161,8 +1161,11 @@ static const struct of_device_id myri_sbus_match[] = {
 MODULE_DEVICE_TABLE(of, myri_sbus_match);
 
 static struct of_platform_driver myri_sbus_driver = {
-       .name           = "myri",
-       .match_table    = myri_sbus_match,
+       .driver = {
+               .name = "myri",
+               .owner = THIS_MODULE,
+               .of_match_table = myri_sbus_match,
+       },
        .probe          = myri_sbus_probe,
        .remove         = __devexit_p(myri_sbus_remove),
 };
index 9c1604c04450ea8a1e197b6a3c51f34ff2f30c70..406d72c4eb71dd93ecd9b016428f0cb19c873dc5 100644 (file)
@@ -10207,8 +10207,11 @@ static const struct of_device_id niu_match[] = {
 MODULE_DEVICE_TABLE(of, niu_match);
 
 static struct of_platform_driver niu_of_driver = {
-       .name           = "niu",
-       .match_table    = niu_match,
+       .driver = {
+               .name = "niu",
+               .owner = THIS_MODULE,
+               .of_match_table = niu_match,
+       },
        .probe          = niu_of_probe,
        .remove         = __devexit_p(niu_of_remove),
 };
index 641973ca2417ee1068b413a2c29a47fcf4535e0a..fc5fef2a81752c17249c66609923eddb5af046da 100644 (file)
@@ -241,8 +241,11 @@ static struct of_device_id mdio_ofgpio_match[] = {
 MODULE_DEVICE_TABLE(of, mdio_ofgpio_match);
 
 static struct of_platform_driver mdio_ofgpio_driver = {
-       .name = "mdio-gpio",
-       .match_table = mdio_ofgpio_match,
+       .driver = {
+               .name = "mdio-gpio",
+               .owner = THIS_MODULE,
+               .of_match_table = mdio_ofgpio_match,
+       },
        .probe = mdio_ofgpio_probe,
        .remove = __devexit_p(mdio_ofgpio_remove),
 };
index bd286ec5abd98f4820b59c7fb1eec45f7a3c3959..5f0ec390d6fc5cf4630380bebae4d84fa097e47b 100644 (file)
@@ -1292,8 +1292,11 @@ static const struct of_device_id bigmac_sbus_match[] = {
 MODULE_DEVICE_TABLE(of, bigmac_sbus_match);
 
 static struct of_platform_driver bigmac_sbus_driver = {
-       .name           = "sunbmac",
-       .match_table    = bigmac_sbus_match,
+       .driver = {
+               .name = "sunbmac",
+               .owner = THIS_MODULE,
+               .of_match_table = bigmac_sbus_match,
+       },
        .probe          = bigmac_sbus_probe,
        .remove         = __devexit_p(bigmac_sbus_remove),
 };
index c6463f71c916cb023e16b3604826e0c6ba01bfa9..ad2cfc5bb9e1debbb7065d833e0dcb5e2840e9ea 100644 (file)
@@ -3295,8 +3295,11 @@ static const struct of_device_id hme_sbus_match[] = {
 MODULE_DEVICE_TABLE(of, hme_sbus_match);
 
 static struct of_platform_driver hme_sbus_driver = {
-       .name           = "hme",
-       .match_table    = hme_sbus_match,
+       .driver = {
+               .name = "hme",
+               .owner = THIS_MODULE,
+               .of_match_table = hme_sbus_match,
+       },
        .probe          = hme_sbus_probe,
        .remove         = __devexit_p(hme_sbus_remove),
 };
index 28afc86e0694f8d310ff0a7dbf73217434d067a1..0fc014ef9e98e8e578f4597896dd2f7cae9cc9b8 100644 (file)
@@ -1546,8 +1546,11 @@ static const struct of_device_id sunlance_sbus_match[] = {
 MODULE_DEVICE_TABLE(of, sunlance_sbus_match);
 
 static struct of_platform_driver sunlance_sbus_driver = {
-       .name           = "sunlance",
-       .match_table    = sunlance_sbus_match,
+       .driver = {
+               .name = "sunlance",
+               .owner = THIS_MODULE,
+               .of_match_table = sunlance_sbus_match,
+       },
        .probe          = sunlance_sbus_probe,
        .remove         = __devexit_p(sunlance_sbus_remove),
 };
index 9864f4fa69d5d7bd239f8a57f103d30a12623e89..8fe86b287e517a52565be46a781df8e0f81d7009 100644 (file)
@@ -978,8 +978,11 @@ static const struct of_device_id qec_sbus_match[] = {
 MODULE_DEVICE_TABLE(of, qec_sbus_match);
 
 static struct of_platform_driver qec_sbus_driver = {
-       .name           = "qec",
-       .match_table    = qec_sbus_match,
+       .driver = {
+               .name = "qec",
+               .owner = THIS_MODULE,
+               .of_match_table = qec_sbus_match,
+       },
        .probe          = qec_sbus_probe,
        .remove         = __devexit_p(qec_sbus_remove),
 };
index 88ebfc9767356171a370d947d02f8642a00ae51c..0ab51037bf885f02bec39fc7838204bc1d34b98d 100644 (file)
@@ -3965,8 +3965,11 @@ static struct of_device_id ucc_geth_match[] = {
 MODULE_DEVICE_TABLE(of, ucc_geth_match);
 
 static struct of_platform_driver ucc_geth_driver = {
-       .name           = DRV_NAME,
-       .match_table    = ucc_geth_match,
+       .driver = {
+               .name = DRV_NAME,
+               .owner = THIS_MODULE,
+               .of_match_table = ucc_geth_match,
+       },
        .probe          = ucc_geth_probe,
        .remove         = ucc_geth_remove,
        .suspend        = ucc_geth_suspend,
index 3dd2416db54090af230a767083e088ba3c05b44d..67f9237237dde2a5623ef0ce6a92596610dfb56e 100644 (file)
@@ -1293,8 +1293,11 @@ static struct of_device_id xemaclite_of_match[] __devinitdata = {
 MODULE_DEVICE_TABLE(of, xemaclite_of_match);
 
 static struct of_platform_driver xemaclite_of_driver = {
-       .name           = DRIVER_NAME,
-       .match_table    = xemaclite_of_match,
+       .driver = {
+               .name = DRIVER_NAME,
+               .owner = THIS_MODULE,
+               .of_match_table = xemaclite_of_match,
+       },
        .probe          = xemaclite_of_probe,
        .remove         = __devexit_p(xemaclite_of_remove),
 };
index 9fd7f7d0a0d13ce9edb1e6f3548a8f3a1ea5cdf6..ba402c613ede23e5133229d1d0cc22332f00cb50 100644 (file)
@@ -385,13 +385,6 @@ int of_bus_type_init(struct bus_type *bus, const char *name)
 
 int of_register_driver(struct of_platform_driver *drv, struct bus_type *bus)
 {
-       /* initialize common driver fields */
-       if (!drv->driver.name)
-               drv->driver.name = drv->name;
-       if (!drv->driver.owner)
-               drv->driver.owner = drv->owner;
-       if (!drv->driver.of_match_table)
-               drv->driver.of_match_table = drv->match_table;
        drv->driver.bus = bus;
 
        /* register with core */
index 065f229580d5cfc3acd8d740597bb638c558a889..9a5b4b89416146827467946e77e96c36ac391c68 100644 (file)
@@ -382,8 +382,11 @@ static const struct of_device_id bpp_match[] = {
 MODULE_DEVICE_TABLE(of, bpp_match);
 
 static struct of_platform_driver bpp_sbus_driver = {
-       .name           = "bpp",
-       .match_table    = bpp_match,
+       .driver = {
+               .name = "bpp",
+               .owner = THIS_MODULE,
+               .of_match_table = bpp_match,
+       },
        .probe          = bpp_probe,
        .remove         = __devexit_p(bpp_remove),
 };
index a22d32d71bf2410b6ad3f2a6b1a3202e0c5365a7..f94d8281cfb04df3fd06582c61e1e2f654c877dd 100644 (file)
@@ -357,8 +357,11 @@ static const struct of_device_id electra_cf_match[] = {
 MODULE_DEVICE_TABLE(of, electra_cf_match);
 
 static struct of_platform_driver electra_cf_driver = {
-       .name      = (char *)driver_name,
-       .match_table    = electra_cf_match,
+       .driver = {
+               .name = (char *)driver_name,
+               .owner = THIS_MODULE,
+               .of_match_table = electra_cf_match,
+       },
        .probe    = electra_cf_probe,
        .remove   = electra_cf_remove,
 };
index 41cc954a5ffee1dd2a87bd4374bd69f22ddb4f9e..1a648b90b634890512ffb95560c1944d5d7a214a 100644 (file)
@@ -1298,8 +1298,11 @@ static const struct of_device_id m8xx_pcmcia_match[] = {
 MODULE_DEVICE_TABLE(of, m8xx_pcmcia_match);
 
 static struct of_platform_driver m8xx_pcmcia_driver = {
-       .name = driver_name,
-       .match_table = m8xx_pcmcia_match,
+       .driver = {
+               .name = driver_name,
+               .owner = THIS_MODULE,
+               .match_table = m8xx_pcmcia_match,
+       },
        .probe = m8xx_probe,
        .remove = m8xx_remove,
 };
index 1543ac32b79b58d95ece150bed4506560138432d..8bfdd63a1fcbc085c33fbbab85c61e8675347138 100644 (file)
@@ -414,8 +414,11 @@ static const struct of_device_id bbc_i2c_match[] = {
 MODULE_DEVICE_TABLE(of, bbc_i2c_match);
 
 static struct of_platform_driver bbc_i2c_driver = {
-       .name           = "bbc_i2c",
-       .match_table    = bbc_i2c_match,
+       .driver = {
+               .name = "bbc_i2c",
+               .owner = THIS_MODULE,
+               .of_match_table = bbc_i2c_match,
+       },
        .probe          = bbc_i2c_probe,
        .remove         = __devexit_p(bbc_i2c_remove),
 };
index 7fc7f34f3466767a2d90aada2b7bfda87436fb2d..7baf1b644039dd0e9282661051760eba8f20d010 100644 (file)
@@ -266,8 +266,11 @@ static const struct of_device_id d7s_match[] = {
 MODULE_DEVICE_TABLE(of, d7s_match);
 
 static struct of_platform_driver d7s_driver = {
-       .name           = DRIVER_NAME,
-       .match_table    = d7s_match,
+       .driver = {
+               .name = DRIVER_NAME,
+               .owner = THIS_MODULE,
+               .of_match_table = d7s_match,
+       },
        .probe          = d7s_probe,
        .remove         = __devexit_p(d7s_remove),
 };
index a5fe20faf4f778dc0535279a8178fc0c655d5ba4..c8166ecf527601423681e0311bfa9ad28de4acb4 100644 (file)
@@ -1131,8 +1131,11 @@ static const struct of_device_id envctrl_match[] = {
 MODULE_DEVICE_TABLE(of, envctrl_match);
 
 static struct of_platform_driver envctrl_driver = {
-       .name           = DRIVER_NAME,
-       .match_table    = envctrl_match,
+       .driver = {
+               .name = DRIVER_NAME,
+               .owner = THIS_MODULE,
+               .of_match_table = envctrl_match,
+       },
        .probe          = envctrl_probe,
        .remove         = __devexit_p(envctrl_remove),
 };
index 202ff8f75afbde3c071dde3a1b165799eecdaa75..0427e586975f38ffb620453fa06cb2978606c9de 100644 (file)
@@ -207,8 +207,11 @@ static const struct of_device_id flash_match[] = {
 MODULE_DEVICE_TABLE(of, flash_match);
 
 static struct of_platform_driver flash_driver = {
-       .name           = "flash",
-       .match_table    = flash_match,
+       .driver = {
+               .name = "flash",
+               .owner = THIS_MODULE,
+               .of_match_table = flash_match,
+       },
        .probe          = flash_probe,
        .remove         = __devexit_p(flash_remove),
 };
index acc6738aa61f79b096bf90e62d985aafd5027f3f..5f253665a1da862b2c3d3159ab426485b4b6a16e 100644 (file)
@@ -425,8 +425,11 @@ static const struct of_device_id uctrl_match[] = {
 MODULE_DEVICE_TABLE(of, uctrl_match);
 
 static struct of_platform_driver uctrl_driver = {
-       .name           = "uctrl",
-       .match_table    = uctrl_match,
+       .driver = {
+               .name = "uctrl",
+               .owner = THIS_MODULE,
+               .of_match_table = uctrl_match,
+       },
        .probe          = uctrl_probe,
        .remove         = __devexit_p(uctrl_remove),
 };
index 35433d23b7ce738e2721c8af3f2f12b916f14422..ca5c15c779cfc5a4d26659818545414b12682052 100644 (file)
@@ -1456,8 +1456,11 @@ static const struct of_device_id qpti_match[] = {
 MODULE_DEVICE_TABLE(of, qpti_match);
 
 static struct of_platform_driver qpti_sbus_driver = {
-       .name           = "qpti",
-       .match_table    = qpti_match,
+       .driver = {
+               .name = "qpti",
+               .owner = THIS_MODULE,
+               .of_match_table = qpti_match,
+       },
        .probe          = qpti_sbus_probe,
        .remove         = __devexit_p(qpti_sbus_remove),
 };
index 151df73df475365d38249d3c617c5f8451b8a47e..386dd9d602b6e32ce4d262375caa4738ff9b1b5e 100644 (file)
@@ -633,8 +633,11 @@ static const struct of_device_id esp_match[] = {
 MODULE_DEVICE_TABLE(of, esp_match);
 
 static struct of_platform_driver esp_sbus_driver = {
-       .name           = "esp",
-       .match_table    = esp_match,
+       .driver = {
+               .name = "esp",
+               .owner = THIS_MODULE,
+               .of_match_table = esp_match,
+       },
        .probe          = esp_sbus_probe,
        .remove         = __devexit_p(esp_sbus_remove),
 };
index 52015d7031bb3a3dbba4824686b3243359f2e3a4..0099b8692b60c7b2f23781b32a530702e56457d7 100644 (file)
@@ -584,12 +584,12 @@ static struct of_device_id __initdata apbuart_match[] = {
 };
 
 static struct of_platform_driver grlib_apbuart_of_driver = {
-       .match_table = apbuart_match,
        .probe = apbuart_probe,
        .driver = {
-                  .owner = THIS_MODULE,
-                  .name = "grlib-apbuart",
-                  },
+               .owner = THIS_MODULE,
+               .name = "grlib-apbuart",
+               .of_match_table = apbuart_match,
+       },
 };
 
 
index 7866cdf8a7547787b27b02ec4d7391b435210d30..9eb62a256e9a675af529475d178c7925e6de5302 100644 (file)
@@ -1372,8 +1372,11 @@ static struct of_device_id cpm_uart_match[] = {
 };
 
 static struct of_platform_driver cpm_uart_driver = {
-       .name = "cpm_uart",
-       .match_table = cpm_uart_match,
+       .driver = {
+               .name = "cpm_uart",
+               .owner = THIS_MODULE,
+               .of_match_table = cpm_uart_match,
+       },
        .probe = cpm_uart_probe,
        .remove = cpm_uart_remove,
  };
index cb079387c5ae59dfb0c55b94c7633c66cc7b787c..4fb32e3748c207865e5b9edd9277cae3ccbf8689 100644 (file)
@@ -1464,15 +1464,16 @@ mpc52xx_uart_of_enumerate(void)
 MODULE_DEVICE_TABLE(of, mpc52xx_uart_of_match);
 
 static struct of_platform_driver mpc52xx_uart_of_driver = {
-       .match_table    = mpc52xx_uart_of_match,
        .probe          = mpc52xx_uart_of_probe,
        .remove         = mpc52xx_uart_of_remove,
 #ifdef CONFIG_PM
        .suspend        = mpc52xx_uart_of_suspend,
        .resume         = mpc52xx_uart_of_resume,
 #endif
-       .driver         = {
-               .name   = "mpc52xx-psc-uart",
+       .driver = {
+               .name = "mpc52xx-psc-uart",
+               .owner = THIS_MODULE,
+               .of_match_table = mpc52xx_uart_of_match,
        },
 };
 
index 29539805e593743d34c44cfc173601afb550edf7..a48d9080f5525f1c97ac0fff59023f85f19d1b67 100644 (file)
@@ -175,11 +175,13 @@ static struct of_device_id __devinitdata of_platform_serial_table[] = {
 };
 
 static struct of_platform_driver of_platform_serial_driver = {
-       .owner = THIS_MODULE,
-       .name = "of_serial",
+       .driver = {
+               .name = "of_serial",
+               .owner = THIS_MODULE,
+               .of_match_table = of_platform_serial_table,
+       },
        .probe = of_platform_serial_probe,
        .remove = of_platform_serial_remove,
-       .match_table = of_platform_serial_table,
 };
 
 static int __init of_platform_serial_init(void)
index d1eedf13d85cd0773beade7ef70ff20dd5ebbcc4..890f91742962433e8b710d060ede982070e09391 100644 (file)
@@ -630,8 +630,11 @@ static const struct of_device_id hv_match[] = {
 MODULE_DEVICE_TABLE(of, hv_match);
 
 static struct of_platform_driver hv_driver = {
-       .name           = "hv",
-       .match_table    = hv_match,
+       .driver = {
+               .name = "hv",
+               .owner = THIS_MODULE,
+               .of_match_table = hv_match,
+       },
        .probe          = hv_probe,
        .remove         = __devexit_p(hv_remove),
 };
index 9176c41b74ad172c864035cf192e3b328afe8e50..5e81bc6b48b0738ad307b9be94149da299f6063f 100644 (file)
@@ -1093,8 +1093,11 @@ static const struct of_device_id sab_match[] = {
 MODULE_DEVICE_TABLE(of, sab_match);
 
 static struct of_platform_driver sab_driver = {
-       .name           = "sab",
-       .match_table    = sab_match,
+       .driver = {
+               .name = "sab",
+               .owner = THIS_MODULE,
+               .of_match_table = sab_match,
+       },
        .probe          = sab_probe,
        .remove         = __devexit_p(sab_remove),
 };
index a647b24480718c87064cac94a29737e0b6b31368..234459c2f0122fc24e78f5b173f3fe4a3f83555d 100644 (file)
@@ -1539,8 +1539,11 @@ static const struct of_device_id su_match[] = {
 MODULE_DEVICE_TABLE(of, su_match);
 
 static struct of_platform_driver su_driver = {
-       .name           = "su",
-       .match_table    = su_match,
+       .driver = {
+               .name = "su",
+               .owner = THIS_MODULE,
+               .of_match_table = su_match,
+       },
        .probe          = su_probe,
        .remove         = __devexit_p(su_remove),
 };
index 20f9be8cd9496dc644a11261b9440def83781438..34fb8e84504f74dbdb836090c620a4a525fe89b1 100644 (file)
@@ -1491,8 +1491,11 @@ static const struct of_device_id zs_match[] = {
 MODULE_DEVICE_TABLE(of, zs_match);
 
 static struct of_platform_driver zs_driver = {
-       .name           = "zs",
-       .match_table    = zs_match,
+       .driver = {
+               .name = "zs",
+               .owner = THIS_MODULE,
+               .of_match_table = zs_match,
+       },
        .probe          = zs_probe,
        .remove         = __devexit_p(zs_remove),
 };
index 8fc2583d06ff7311890b320aca586c4955781a04..81073e3426e08dc5eaa2f9ade8b9eb02265203cc 100644 (file)
@@ -610,13 +610,12 @@ static int __devexit ulite_of_remove(struct of_device *op)
 }
 
 static struct of_platform_driver ulite_of_driver = {
-       .owner = THIS_MODULE,
-       .name = "uartlite",
-       .match_table = ulite_of_match,
        .probe = ulite_of_probe,
        .remove = __devexit_p(ulite_of_remove),
        .driver = {
                .name = "uartlite",
+               .owner = THIS_MODULE,
+               .of_match_table = ulite_of_match,
        },
 };
 
index 529890f044e2500e36efd1c2d33a96c6c2c3b0f0..907b06f5c447cabb94e4a723e8c58fad37a2ebd5 100644 (file)
@@ -1486,9 +1486,11 @@ static struct of_device_id ucc_uart_match[] = {
 MODULE_DEVICE_TABLE(of, ucc_uart_match);
 
 static struct of_platform_driver ucc_uart_of_driver = {
-       .owner          = THIS_MODULE,
-       .name           = "ucc_uart",
-       .match_table    = ucc_uart_match,
+       .driver = {
+               .name = "ucc_uart",
+               .owner = THIS_MODULE,
+               .of_match_table    = ucc_uart_match,
+       },
        .probe          = ucc_uart_probe,
        .remove         = ucc_uart_remove,
 };
index 7fcf2840586056c18c14df099029eaf319b5fe11..7104cb739da7eceab4af5a2bcf644c0aaa239d26 100644 (file)
@@ -514,14 +514,12 @@ static const struct of_device_id mpc52xx_psc_spi_of_match[] = {
 MODULE_DEVICE_TABLE(of, mpc52xx_psc_spi_of_match);
 
 static struct of_platform_driver mpc52xx_psc_spi_of_driver = {
-       .owner = THIS_MODULE,
-       .name = "mpc52xx-psc-spi",
-       .match_table = mpc52xx_psc_spi_of_match,
        .probe = mpc52xx_psc_spi_of_probe,
        .remove = __exit_p(mpc52xx_psc_spi_of_remove),
        .driver = {
                .name = "mpc52xx-psc-spi",
                .owner = THIS_MODULE,
+               .of_match_table = mpc52xx_psc_spi_of_match,
        },
 };
 
index 6573233bf7c97ab7c15f1244a91855df62aba723..b1a76bff775f8f2c11e0c1d35efc41039fa95acf 100644 (file)
@@ -558,9 +558,11 @@ static const struct of_device_id mpc52xx_spi_match[] __devinitconst = {
 MODULE_DEVICE_TABLE(of, mpc52xx_spi_match);
 
 static struct of_platform_driver mpc52xx_spi_of_driver = {
-       .owner = THIS_MODULE,
-       .name = "mpc52xx-spi",
-       .match_table = mpc52xx_spi_match,
+       .driver = {
+               .name = "mpc52xx-spi",
+               .owner = THIS_MODULE,
+               .of_match_table = mpc52xx_spi_match,
+       },
        .probe = mpc52xx_spi_probe,
        .remove = __exit_p(mpc52xx_spi_remove),
 };
index 7572f98a419e7902431552686f9a5611d9450314..77ab15e330d03df094af1306175726c3e5267e56 100644 (file)
@@ -1312,8 +1312,11 @@ static const struct of_device_id of_mpc8xxx_spi_match[] = {
 MODULE_DEVICE_TABLE(of, of_mpc8xxx_spi_match);
 
 static struct of_platform_driver of_mpc8xxx_spi_driver = {
-       .name           = "mpc8xxx_spi",
-       .match_table    = of_mpc8xxx_spi_match,
+       .driver = {
+               .name = "mpc8xxx_spi",
+               .owner = THIS_MODULE,
+               .of_match_table = of_mpc8xxx_spi_match,
+       },
        .probe          = of_mpc8xxx_spi_probe,
        .remove         = __devexit_p(of_mpc8xxx_spi_remove),
 };
index 7cb5ff37f6e2662254eb66a321b1be2acb2c604b..19c0b3b34fce0160d7cb4d0b0c16f14d8143671d 100644 (file)
@@ -587,12 +587,12 @@ static const struct of_device_id spi_ppc4xx_of_match[] = {
 MODULE_DEVICE_TABLE(of, spi_ppc4xx_of_match);
 
 static struct of_platform_driver spi_ppc4xx_of_driver = {
-       .match_table = spi_ppc4xx_of_match,
        .probe = spi_ppc4xx_of_probe,
        .remove = __exit_p(spi_ppc4xx_of_remove),
        .driver = {
                .name = DRIVER_NAME,
                .owner = THIS_MODULE,
+               .of_match_table = spi_ppc4xx_of_match,
        },
 };
 
index 748d33a76d290286c6435ff3d11965c2e023525d..55c58012a028392e0c2b6cfbcdb06e1f3ccb86d1 100644 (file)
@@ -109,12 +109,12 @@ static const struct of_device_id xilinx_spi_of_match[] = {
 MODULE_DEVICE_TABLE(of, xilinx_spi_of_match);
 
 static struct of_platform_driver xilinx_spi_of_driver = {
-       .match_table = xilinx_spi_of_match,
        .probe = xilinx_spi_of_probe,
        .remove = __exit_p(xilinx_spi_of_remove),
        .driver = {
                .name = "xilinx-xps-spi",
                .owner = THIS_MODULE,
+               .of_match_table = xilinx_spi_of_match,
        },
 };
 
index 3537d51073b2e9216e9dd02891894f46e9f0fc63..2928523268b53ac61470959ac6d6cd41519633d1 100644 (file)
@@ -2768,8 +2768,11 @@ static const struct of_device_id qe_udc_match[] __devinitconst = {
 MODULE_DEVICE_TABLE(of, qe_udc_match);
 
 static struct of_platform_driver udc_driver = {
-       .name           = (char *)driver_name,
-       .match_table    = qe_udc_match,
+       .driver = {
+               .name = (char *)driver_name,
+               .owner = THIS_MODULE,
+               .of_match_table = qe_udc_match,
+       },
        .probe          = qe_udc_probe,
        .remove         = __devexit_p(qe_udc_remove),
 #ifdef CONFIG_PM
index ad0662354a5e188d81b0347cbbd81675440554c7..5aec92866ab3e1398ac4450ec62f9d9dfe9c195c 100644 (file)
@@ -274,13 +274,12 @@ MODULE_DEVICE_TABLE(of, ehci_hcd_ppc_of_match);
 
 
 static struct of_platform_driver ehci_hcd_ppc_of_driver = {
-       .name           = "ppc-of-ehci",
-       .match_table    = ehci_hcd_ppc_of_match,
        .probe          = ehci_hcd_ppc_of_probe,
        .remove         = ehci_hcd_ppc_of_remove,
        .shutdown       = ehci_hcd_ppc_of_shutdown,
-       .driver         = {
-               .name   = "ppc-of-ehci",
-               .owner  = THIS_MODULE,
+       .driver = {
+               .name = "ppc-of-ehci",
+               .owner = THIS_MODULE,
+               .of_match_table = ehci_hcd_ppc_of_match,
        },
 };
index f603bb2c0a8eedba86bbbad4370e154e1b9c7b0c..013972bbde57d21bd16c737c1a1e455a1f90876a 100644 (file)
@@ -288,13 +288,12 @@ static const struct of_device_id ehci_hcd_xilinx_of_match[] = {
 MODULE_DEVICE_TABLE(of, ehci_hcd_xilinx_of_match);
 
 static struct of_platform_driver ehci_hcd_xilinx_of_driver = {
-       .name           = "xilinx-of-ehci",
-       .match_table    = ehci_hcd_xilinx_of_match,
        .probe          = ehci_hcd_xilinx_of_probe,
        .remove         = ehci_hcd_xilinx_of_remove,
        .shutdown       = ehci_hcd_xilinx_of_shutdown,
-       .driver         = {
-               .name   = "xilinx-of-ehci",
-               .owner  = THIS_MODULE,
+       .driver = {
+               .name = "xilinx-of-ehci",
+               .owner = THIS_MODULE,
+               .of_match_table = ehci_hcd_xilinx_of_match,
        },
 };
index 6135732d8057b8f8571cc0e5f81c4b769c61b2b4..7b5c62654bfd5baaea2f4de0b4b6f839fa4cb678 100644 (file)
@@ -813,8 +813,11 @@ static const struct of_device_id of_fhci_match[] = {
 MODULE_DEVICE_TABLE(of, of_fhci_match);
 
 static struct of_platform_driver of_fhci_driver = {
-       .name           = "fsl,usb-fhci",
-       .match_table    = of_fhci_match,
+       .driver = {
+               .name = "fsl,usb-fhci",
+               .owner = THIS_MODULE,
+               .of_match_table = of_fhci_match,
+       },
        .probe          = of_fhci_probe,
        .remove         = __devexit_p(of_fhci_remove),
 };
index 36360e24a9b953ac99a6ccac4d63d7ff90bdaab0..100d5faebe3c02d695df877d48561d3c5782083f 100644 (file)
@@ -121,8 +121,11 @@ static const struct of_device_id of_isp1760_match[] = {
 MODULE_DEVICE_TABLE(of, of_isp1760_match);
 
 static struct of_platform_driver isp1760_of_driver = {
-       .name           = "nxp-isp1760",
-       .match_table    = of_isp1760_match,
+       .driver = {
+               .name = "nxp-isp1760",
+               .owner = THIS_MODULE,
+               .of_match_table = of_isp1760_match,
+       },
        .probe          = of_isp1760_probe,
        .remove         = of_isp1760_remove,
 };
index 003aea21c35ee865d31bbebf1061ec98104e4eb4..df165917412a85d821084dcd37c991522254e4b2 100644 (file)
@@ -244,18 +244,13 @@ MODULE_DEVICE_TABLE(of, ohci_hcd_ppc_of_match);
 
 
 static struct of_platform_driver ohci_hcd_ppc_of_driver = {
-       .name           = "ppc-of-ohci",
-       .match_table    = ohci_hcd_ppc_of_match,
        .probe          = ohci_hcd_ppc_of_probe,
        .remove         = ohci_hcd_ppc_of_remove,
        .shutdown       = ohci_hcd_ppc_of_shutdown,
-#ifdef CONFIG_PM
-       /*.suspend      = ohci_hcd_ppc_soc_drv_suspend,*/
-       /*.resume       = ohci_hcd_ppc_soc_drv_resume,*/
-#endif
-       .driver         = {
-               .name   = "ppc-of-ohci",
-               .owner  = THIS_MODULE,
+       .driver = {
+               .name = "ppc-of-ohci",
+               .owner = THIS_MODULE,
+               .of_match_table = ohci_hcd_ppc_of_match,
        },
 };
 
index 43320925c4cea48b980a905fa0d5766cadcad335..2c371c07f0daaff562b844184bfb742284b9cc53 100644 (file)
@@ -376,8 +376,11 @@ static const struct of_device_id bw2_match[] = {
 MODULE_DEVICE_TABLE(of, bw2_match);
 
 static struct of_platform_driver bw2_driver = {
-       .name           = "bw2",
-       .match_table    = bw2_match,
+       .driver = {
+               .name = "bw2",
+               .owner = THIS_MODULE,
+               .of_match_table = bw2_match,
+       },
        .probe          = bw2_probe,
        .remove         = __devexit_p(bw2_remove),
 };
index 77a040af20a7860626b9bae5696b88fce42a0c20..d12e05b6e63f96ce0cd36ba1ddb810167953d280 100644 (file)
@@ -596,8 +596,11 @@ static const struct of_device_id cg14_match[] = {
 MODULE_DEVICE_TABLE(of, cg14_match);
 
 static struct of_platform_driver cg14_driver = {
-       .name           = "cg14",
-       .match_table    = cg14_match,
+       .driver = {
+               .name = "cg14",
+               .owner = THIS_MODULE,
+               .of_match_table = cg14_match,
+       },
        .probe          = cg14_probe,
        .remove         = __devexit_p(cg14_remove),
 };
index 30eedf79322c4dcff534da06fe7938a5753d112c..b98f93f7f6638f0a02a39250aaeaca54b595bbb3 100644 (file)
@@ -463,8 +463,11 @@ static const struct of_device_id cg3_match[] = {
 MODULE_DEVICE_TABLE(of, cg3_match);
 
 static struct of_platform_driver cg3_driver = {
-       .name           = "cg3",
-       .match_table    = cg3_match,
+       .driver = {
+               .name = "cg3",
+               .owner = THIS_MODULE,
+               .of_match_table = cg3_match,
+       },
        .probe          = cg3_probe,
        .remove         = __devexit_p(cg3_remove),
 };
index 7f59b0fe5dc2b44a039e9c88b45c4a23ddd459e7..480d761a27a839b1e265eefe8204a17fb1f56504 100644 (file)
@@ -856,8 +856,11 @@ static const struct of_device_id cg6_match[] = {
 MODULE_DEVICE_TABLE(of, cg6_match);
 
 static struct of_platform_driver cg6_driver = {
-       .name           = "cg6",
-       .match_table    = cg6_match,
+       .driver = {
+               .name = "cg6",
+               .owner = THIS_MODULE,
+               .of_match_table = cg6_match,
+       },
        .probe          = cg6_probe,
        .remove         = __devexit_p(cg6_remove),
 };
index ddd46f71e250a990c87b22d82c2cc58cc7dd4397..95c0227f47fcfd7fd30ea784b4202af1dace340a 100644 (file)
@@ -1053,8 +1053,11 @@ static const struct of_device_id ffb_match[] = {
 MODULE_DEVICE_TABLE(of, ffb_match);
 
 static struct of_platform_driver ffb_driver = {
-       .name           = "ffb",
-       .match_table    = ffb_match,
+       .driver = {
+               .name = "ffb",
+               .owner = THIS_MODULE,
+               .of_match_table = ffb_match,
+       },
        .probe          = ffb_probe,
        .remove         = __devexit_p(ffb_remove),
 };
index 930a2522a63123a1ee97e181ca6471de14b187a0..27455ce298b724bbecb03c1598d5b296309ce655 100644 (file)
@@ -1647,9 +1647,11 @@ static struct of_device_id fsl_diu_match[] = {
 MODULE_DEVICE_TABLE(of, fsl_diu_match);
 
 static struct of_platform_driver fsl_diu_driver = {
-       .owner          = THIS_MODULE,
-       .name           = "fsl_diu",
-       .match_table    = fsl_diu_match,
+       .driver = {
+               .name = "fsl_diu",
+               .owner = THIS_MODULE,
+               .of_match_table = fsl_diu_match,
+       },
        .probe          = fsl_diu_probe,
        .remove         = fsl_diu_remove,
        .suspend        = fsl_diu_suspend,
index 1db55f128490213ebfc35a6ad6ed87176af670fb..3d7895316eaf37e79bb56f2413d748fcbdfca131 100644 (file)
@@ -663,8 +663,11 @@ static const struct of_device_id leo_match[] = {
 MODULE_DEVICE_TABLE(of, leo_match);
 
 static struct of_platform_driver leo_driver = {
-       .name           = "leo",
-       .match_table    = leo_match,
+       .driver = {
+               .name = "leo",
+               .owner = THIS_MODULE,
+               .of_match_table = leo_match,
+       },
        .probe          = leo_probe,
        .remove         = __devexit_p(leo_remove),
 };
index 8280a58a0e557c4368f5de03ce129d24f38aa649..0540de4f5cb48f062bedb6d9874964ab1423d62b 100644 (file)
@@ -718,9 +718,11 @@ static struct of_device_id __devinitdata of_platform_mb862xx_tbl[] = {
 };
 
 static struct of_platform_driver of_platform_mb862xxfb_driver = {
-       .owner          = THIS_MODULE,
-       .name           = DRV_NAME,
-       .match_table    = of_platform_mb862xx_tbl,
+       .driver = {
+               .name = DRV_NAME,
+               .owner = THIS_MODULE,
+               .of_match_table = of_platform_mb862xx_tbl,
+       },
        .probe          = of_platform_mb862xx_probe,
        .remove         = __devexit_p(of_platform_mb862xx_remove),
 };
index 81440f2b90919c2e9904343c24528fe989472270..c85dd408a9b87369fffdce371fad0754f1100810 100644 (file)
@@ -353,8 +353,11 @@ static const struct of_device_id p9100_match[] = {
 MODULE_DEVICE_TABLE(of, p9100_match);
 
 static struct of_platform_driver p9100_driver = {
-       .name           = "p9100",
-       .match_table    = p9100_match,
+       .driver = {
+               .name = "p9100",
+               .owner = THIS_MODULE,
+               .of_match_table = p9100_match,
+       },
        .probe          = p9100_probe,
        .remove         = __devexit_p(p9100_remove),
 };
index 69d78d50f0f687185aa694066c222ae02d32133c..72a1f4c047326c1d69634110fa68ec3061c20b48 100644 (file)
@@ -679,8 +679,11 @@ static struct of_device_id platinumfb_match[] =
 
 static struct of_platform_driver platinum_driver = 
 {
-       .name           = "platinumfb",
-       .match_table    = platinumfb_match,
+       .driver = {
+               .name = "platinumfb",
+               .owner = THIS_MODULE,
+               .of_match_table = platinumfb_match,
+       },
        .probe          = platinumfb_probe,
        .remove         = platinumfb_remove,
 };
index ad92a200fafaa107221c540494b0f04cd3f0176a..489b44e8db8153dac7a06bda8abae694c878d7e0 100644 (file)
@@ -199,10 +199,13 @@ static const struct of_device_id gfb_match[] = {
 MODULE_DEVICE_TABLE(of, ffb_match);
 
 static struct of_platform_driver gfb_driver = {
-       .name           = "gfb",
-       .match_table    = gfb_match,
        .probe          = gfb_probe,
        .remove         = __devexit_p(gfb_remove),
+       .driver = {
+               .name           = "gfb",
+               .owner          = THIS_MODULE,
+               .of_match_table = gfb_match,
+       },
 };
 
 static int __init gfb_init(void)
index c0c2b18fcdcff6229bdd7afaffa2cbd36c30a891..ef7a7bd8b503492fec8aa1f56ab678adfe2f06f0 100644 (file)
@@ -512,8 +512,11 @@ static const struct of_device_id tcx_match[] = {
 MODULE_DEVICE_TABLE(of, tcx_match);
 
 static struct of_platform_driver tcx_driver = {
-       .name           = "tcx",
-       .match_table    = tcx_match,
+       .driver = {
+               .name = "tcx",
+               .owner = THIS_MODULE,
+               .of_match_table = tcx_match,
+       },
        .probe          = tcx_probe,
        .remove         = __devexit_p(tcx_remove),
 };
index 6fcec553662ccda60e9e5e04575633eefadf63ed..574dc54e12d43e97038eacae80292dc75d53419b 100644 (file)
@@ -492,13 +492,12 @@ static struct of_device_id xilinxfb_of_match[] __devinitdata = {
 MODULE_DEVICE_TABLE(of, xilinxfb_of_match);
 
 static struct of_platform_driver xilinxfb_of_driver = {
-       .owner = THIS_MODULE,
-       .name = DRIVER_NAME,
-       .match_table = xilinxfb_of_match,
        .probe = xilinxfb_of_probe,
        .remove = __devexit_p(xilinxfb_of_remove),
        .driver = {
                .name = DRIVER_NAME,
+               .owner = THIS_MODULE,
+               .of_match_table = xilinxfb_of_match,
        },
 };
 
index 2fcc3cf7ef62cb20c2c11a06bb45b8b7d6718c6c..d62b9ce8f773cb0d402bb43794b121bddae02209 100644 (file)
@@ -677,8 +677,11 @@ static const struct of_device_id cpwd_match[] = {
 MODULE_DEVICE_TABLE(of, cpwd_match);
 
 static struct of_platform_driver cpwd_driver = {
-       .name           = DRIVER_NAME,
-       .match_table    = cpwd_match,
+       .driver = {
+               .name = DRIVER_NAME,
+               .owner = THIS_MODULE,
+               .of_match_table = cpwd_match,
+       },
        .probe          = cpwd_probe,
        .remove         = __devexit_p(cpwd_remove),
 };
index abdbad034a6c8aec9f7ecf3fa0641db4bf66690f..ca0f4c6cf5ab98217f1b444a94611b0098781041 100644 (file)
@@ -303,9 +303,11 @@ static const struct of_device_id gef_wdt_ids[] = {
 };
 
 static struct of_platform_driver gef_wdt_driver = {
-       .owner          = THIS_MODULE,
-       .name           = "gef_wdt",
-       .match_table    = gef_wdt_ids,
+       .driver = {
+               .name = "gef_wdt",
+               .owner = THIS_MODULE,
+               .of_match_table = gef_wdt_ids,
+       },
        .probe          = gef_wdt_probe,
 };
 
index 4e3941c5e29330e1685f63105e962ab1745fc33e..7b55974191dd7ea5b160f1973e10509f253862aa 100644 (file)
@@ -273,12 +273,12 @@ static const struct of_device_id mpc8xxx_wdt_match[] = {
 MODULE_DEVICE_TABLE(of, mpc8xxx_wdt_match);
 
 static struct of_platform_driver mpc8xxx_wdt_driver = {
-       .match_table    = mpc8xxx_wdt_match,
        .probe          = mpc8xxx_wdt_probe,
        .remove         = __devexit_p(mpc8xxx_wdt_remove),
-       .driver         = {
-               .name   = "mpc8xxx_wdt",
-               .owner  = THIS_MODULE,
+       .driver = {
+               .name = "mpc8xxx_wdt",
+               .owner = THIS_MODULE,
+               .of_match_table = mpc8xxx_wdt_match,
        },
 };
 
index ea7f803f624862f973a024737d9e49ef039202a0..5dceeddc88596c833add1e6abc2ec5db65048279 100644 (file)
@@ -239,8 +239,11 @@ static const struct of_device_id riowd_match[] = {
 MODULE_DEVICE_TABLE(of, riowd_match);
 
 static struct of_platform_driver riowd_driver = {
-       .name           = DRIVER_NAME,
-       .match_table    = riowd_match,
+       .driver = {
+               .name = DRIVER_NAME,
+               .owner = THIS_MODULE,
+               .of_match_table = riowd_match,
+       },
        .probe          = riowd_probe,
        .remove         = __devexit_p(riowd_remove),
 };
index ac3ae0758fbe44b723213e01ddcd9642cb8e98a0..1643d3761eb4134897b956bed7844b05814fd662 100644 (file)
@@ -31,10 +31,6 @@ extern struct bus_type of_platform_bus_type;
  */
 struct of_platform_driver
 {
-       const char              *name;
-       const struct of_device_id       *match_table;
-       struct module           *owner;
-
        int     (*probe)(struct of_device* dev,
                         const struct of_device_id *match);
        int     (*remove)(struct of_device* dev);
index 3dbc7f7cd7b9a01a9b89cc3512a46159cc804133..e2ee220bfb7ea86dcd322da92a5025c0ce026f7e 100644 (file)
@@ -317,12 +317,12 @@ static struct of_device_id psc_ac97_match[] __devinitdata = {
 MODULE_DEVICE_TABLE(of, psc_ac97_match);
 
 static struct of_platform_driver psc_ac97_driver = {
-       .match_table = psc_ac97_match,
        .probe = psc_ac97_of_probe,
        .remove = __devexit_p(psc_ac97_of_remove),
        .driver = {
                .name = "mpc5200-psc-ac97",
                .owner = THIS_MODULE,
+               .of_match_table = psc_ac97_match,
        },
 };
 
index 748cc0f0df38247ac9c82c7fe2afed5a74966ad8..4f455bd6851ffd87102e6003dfd868b12f5b13f8 100644 (file)
@@ -220,12 +220,12 @@ static struct of_device_id psc_i2s_match[] __devinitdata = {
 MODULE_DEVICE_TABLE(of, psc_i2s_match);
 
 static struct of_platform_driver psc_i2s_driver = {
-       .match_table = psc_i2s_match,
        .probe = psc_i2s_of_probe,
        .remove = __devexit_p(psc_i2s_of_remove),
        .driver = {
                .name = "mpc5200-psc-i2s",
                .owner = THIS_MODULE,
+               .of_match_table = psc_i2s_match,
        },
 };
 
index e3f78f255a60b521160dcf906b2942bc18c35d1e..6a2764ee8203980b25b07227f3aba9978c72e286 100644 (file)
@@ -580,9 +580,11 @@ static struct of_device_id mpc8610_hpcd_match[] = {
 MODULE_DEVICE_TABLE(of, mpc8610_hpcd_match);
 
 static struct of_platform_driver mpc8610_hpcd_of_driver = {
-       .owner          = THIS_MODULE,
-       .name           = "mpc8610_hpcd",
-       .match_table    = mpc8610_hpcd_match,
+       .driver = {
+               .name = "mpc8610_hpcd",
+               .owner = THIS_MODULE,
+               .of_match_table = mpc8610_hpcd_match,
+       },
        .probe          = mpc8610_hpcd_probe,
        .remove         = mpc8610_hpcd_remove,
 };
index 574af56ba8a6fa6d4b690f4b2079ea459281712c..71221fd209445b55a09093986a7a330546277381 100644 (file)
@@ -1065,8 +1065,11 @@ static const struct of_device_id amd7930_match[] = {
 };
 
 static struct of_platform_driver amd7930_sbus_driver = {
-       .name           = "audio",
-       .match_table    = amd7930_match,
+       .driver = {
+               .name = "audio",
+               .owner = THIS_MODULE,
+               .of_match_table = amd7930_match,
+       },
        .probe          = amd7930_sbus_probe,
 };
 
index 6a4c872e00df0ba3acf4c5d8901743f399d8bf42..fb4c6f2f29e5d1b97a69ec2ccd00d6ff7b750ff4 100644 (file)
@@ -2109,8 +2109,11 @@ static const struct of_device_id cs4231_match[] = {
 MODULE_DEVICE_TABLE(of, cs4231_match);
 
 static struct of_platform_driver cs4231_driver = {
-       .name           = "audio",
-       .match_table    = cs4231_match,
+       .driver = {
+               .name = "audio",
+               .owner = THIS_MODULE,
+               .of_match_table = cs4231_match,
+       },
        .probe          = cs4231_probe,
        .remove         = __devexit_p(cs4231_remove),
 };
index 1b5192eb5ae500a0899c6f5965ef26bbb5c9e79f..1557bf132e732fe172a383f3f64cec7ca4bb27f4 100644 (file)
@@ -2687,8 +2687,11 @@ static const struct of_device_id dbri_match[] = {
 MODULE_DEVICE_TABLE(of, dbri_match);
 
 static struct of_platform_driver dbri_sbus_driver = {
-       .name           = "dbri",
-       .match_table    = dbri_match,
+       .driver = {
+               .name = "dbri",
+               .owner = THIS_MODULE,
+               .of_match_table = dbri_match,
+       },
        .probe          = dbri_probe,
        .remove         = __devexit_p(dbri_remove),
 };