Clean up of_platform drivers
Subsystems (46)
cover Clean up of_platform drivers
struct of_platform_driver unnecessarily duplicates the .owner and .name fields from the encapsulated struct device_driver. This patch series goes through all of_platform drivers and makes it use the device_driver instance so that the duplicate field can be removed.
Since every of_platform_driver is getting touched anyway, this series takes the opportunity to also move the of_device_id match table out of struct of_platform_driver and into struct device_driver proper. This makes it possible for all bus types to make use of OF-style binding when CONFIG_OF is set.
I've compile tested this on sparc, powerpc and microblaze. It should all be fully bisectable, and only the last patch removes the old fields (ie. nothing should break without the last patch).
g.
---
Grant Likely (27):
of: remove obsolete members from of_platform_driver
arch/sparc/of: don't use deprecated field in of_platform_driver arch/powerpc/of: don't use deprecated field in of_platform_driver sound/of: don't use deprecated fields in of_platform_driver drivers/infiniband/of: don't use deprecated fields in of_platform_driver drivers/i2c/of: don't use deprecated field in of_platform_driver drivers/hwmon/of: don't use deprecated field in of_platform_driver drivers/mmc/of: don't use deprecated field in of_platform_driver drivers/pcmcia/of: don't use deprecated field in of_platform_driver drivers/parport/of: don't use deprecated field in of_platform_driver drivers/sbus/of: don't use deprecated field in of_platform_driver drivers/scsi/of: don't use deprecated field in of_platform_driver drivers/spi/of: don't use deprecated field in of_platform_driver drivers/serial/of: don't use deprecated field in of_platform_driver drivers/net/of: don't use deprecated field in of_platform_driver drivers/mtd/of: don't use deprecated field in of_platform_driver drivers/macintosh/of: don't use deprecated field in of_platform_driver drivers/input/of: don't use deprecated field in of_platform_driver drivers/atm/of: don't use deprecated field in of_platform_driver drivers/crypto/of: don't use deprecated field in of_platform_driver drivers/char/of: don't use deprecated field in of_platform_driver drivers/block/of: don't use deprecated field in of_platform_driver drivers/usb/of: don't use deprecated field in of_platform_driver drivers/video/of: don't use deprecated field in of_platform_driver drivers/watchdog/of: don't use deprecated .name and .owner in of_platform_driver drivers/gpio/of: don't use deprecated fields in of_platform_driver
drivercore: Add of_match_table to the common device drivers
arch/powerpc/kernel/ibmebus.c | 2 +- arch/powerpc/kernel/of_platform.c | 3 ++- arch/powerpc/platforms/52xx/mpc52xx_gpio.c | 14 ++++++++---- arch/powerpc/platforms/52xx/mpc52xx_gpt.c | 7 ++++-- arch/powerpc/platforms/52xx/mpc52xx_lpbfifo.c | 8 ++++--- arch/powerpc/platforms/82xx/ep8248e.c | 3 ++- arch/powerpc/platforms/83xx/suspend.c | 7 ++++-- arch/powerpc/platforms/cell/axon_msi.c | 7 +++--- arch/powerpc/platforms/pasemi/gpio_mdio.c | 7 +++--- arch/powerpc/sysdev/axonram.c | 8 +++---- arch/powerpc/sysdev/bestcomm/bestcomm.c | 10 +++----- arch/powerpc/sysdev/fsl_msi.c | 7 ++++-- arch/powerpc/sysdev/fsl_pmc.c | 7 ++++-- arch/powerpc/sysdev/fsl_rio.c | 7 ++++-- arch/powerpc/sysdev/pmi.c | 7 +++--- arch/powerpc/sysdev/qe_lib/qe.c | 7 ++++-- arch/sparc/include/asm/parport.h | 7 ++++-- arch/sparc/kernel/apc.c | 7 ++++-- arch/sparc/kernel/auxio_64.c | 7 +++--- arch/sparc/kernel/central.c | 14 +++++++----- arch/sparc/kernel/chmc.c | 7 ++++-- arch/sparc/kernel/pci_fire.c | 7 ++++-- arch/sparc/kernel/pci_psycho.c | 7 ++++-- arch/sparc/kernel/pci_sabre.c | 7 ++++-- arch/sparc/kernel/pci_schizo.c | 7 ++++-- arch/sparc/kernel/pci_sun4v.c | 7 ++++-- arch/sparc/kernel/pmc.c | 7 ++++-- arch/sparc/kernel/power.c | 7 +++--- arch/sparc/kernel/time_32.c | 7 +++--- arch/sparc/kernel/time_64.c | 21 ++++++++++-------- drivers/ata/pata_of_platform.c | 7 ++++-- drivers/ata/sata_fsl.c | 7 ++++-- drivers/atm/fore200e.c | 7 ++++-- drivers/block/xsysace.c | 5 ++-- drivers/char/hw_random/n2-drv.c | 7 ++++-- drivers/char/hw_random/pasemi-rng.c | 7 ++++-- drivers/char/ipmi/ipmi_si_intf.c | 7 ++++-- drivers/char/xilinx_hwicap/xilinx_hwicap.c | 5 ++-- drivers/crypto/amcc/crypto4xx_core.c | 7 ++++-- drivers/crypto/talitos.c | 7 ++++-- drivers/dma/fsldma.c | 13 +++++++---- drivers/dma/ppc4xx/adma.c | 2 +- drivers/edac/mpc85xx_edac.c | 30 ++++++++++--------------- drivers/edac/ppc4xx_edac.c | 10 ++++---- drivers/hwmon/ultra45_env.c | 7 ++++-- drivers/i2c/busses/i2c-cpm.c | 10 ++++---- drivers/i2c/busses/i2c-ibm_iic.c | 7 ++++-- drivers/i2c/busses/i2c-mpc.c | 8 +++---- drivers/infiniband/hw/ehca/ehca_main.c | 7 +++--- drivers/input/misc/sparcspkr.c | 14 ++++++++---- drivers/input/serio/i8042-sparcio.h | 7 ++++-- drivers/input/serio/xilinx_ps2.c | 7 ++++-- drivers/leds/leds-gpio.c | 2 +- drivers/macintosh/macio_asic.c | 5 ++-- drivers/macintosh/smu.c | 7 ++++-- drivers/macintosh/therm_pm72.c | 7 ++++-- drivers/macintosh/therm_windtunnel.c | 7 ++++-- drivers/mmc/host/sdhci-of-core.c | 7 ++++-- drivers/mtd/maps/physmap_of.c | 7 ++++-- drivers/mtd/maps/sun_uflash.c | 7 ++++-- drivers/mtd/nand/fsl_elbc_nand.c | 5 +++- drivers/mtd/nand/fsl_upm.c | 7 ++++-- drivers/mtd/nand/ndfc.c | 5 +++- drivers/mtd/nand/pasemi_nand.c | 7 ++++-- drivers/mtd/nand/socrates_nand.c | 7 ++++-- drivers/net/can/mscan/mpc5xxx_can.c | 8 ++++--- drivers/net/can/sja1000/sja1000_of_platform.c | 8 ++++--- drivers/net/ehea/ehea_main.c | 7 ++++-- drivers/net/fs_enet/fs_enet-main.c | 7 ++++-- drivers/net/fs_enet/mii-bitbang.c | 7 ++++-- drivers/net/fs_enet/mii-fec.c | 7 ++++-- drivers/net/fsl_pq_mdio.c | 7 ++++-- drivers/net/gianfar.c | 10 +++++--- drivers/net/ibm_newemac/core.c | 8 ++++--- drivers/net/ibm_newemac/mal.c | 8 ++++--- drivers/net/ibm_newemac/rgmii.c | 8 ++++--- drivers/net/ibm_newemac/tah.c | 8 ++++--- drivers/net/ibm_newemac/zmii.c | 8 ++++--- drivers/net/ll_temac_main.c | 2 +- drivers/net/myri_sbus.c | 7 ++++-- drivers/net/niu.c | 7 ++++-- drivers/net/phy/mdio-gpio.c | 7 ++++-- drivers/net/sunbmac.c | 7 ++++-- drivers/net/sunhme.c | 7 ++++-- drivers/net/sunlance.c | 7 ++++-- drivers/net/sunqe.c | 7 ++++-- drivers/net/ucc_geth.c | 7 ++++-- drivers/net/xilinx_emaclite.c | 7 ++++-- drivers/of/platform.c | 10 ++------ drivers/parport/parport_sunbpp.c | 7 ++++-- drivers/pcmcia/electra_cf.c | 7 ++++-- drivers/pcmcia/m8xx_pcmcia.c | 7 ++++-- drivers/sbus/char/bbc_i2c.c | 7 ++++-- drivers/sbus/char/display7seg.c | 7 ++++-- drivers/sbus/char/envctrl.c | 7 ++++-- drivers/sbus/char/flash.c | 7 ++++-- drivers/sbus/char/uctrl.c | 7 ++++-- drivers/scsi/qlogicpti.c | 7 ++++-- drivers/scsi/sun_esp.c | 7 ++++-- drivers/serial/apbuart.c | 8 +++---- drivers/serial/cpm_uart/cpm_uart_core.c | 7 ++++-- drivers/serial/mpc52xx_uart.c | 7 +++--- drivers/serial/of_serial.c | 8 ++++--- drivers/serial/sunhv.c | 7 ++++-- drivers/serial/sunsab.c | 7 ++++-- drivers/serial/sunsu.c | 7 ++++-- drivers/serial/sunzilog.c | 7 ++++-- drivers/serial/uartlite.c | 5 ++-- drivers/serial/ucc_uart.c | 8 ++++--- drivers/spi/mpc52xx_psc_spi.c | 4 +-- drivers/spi/mpc52xx_spi.c | 8 ++++--- drivers/spi/spi_mpc8xxx.c | 7 ++++-- drivers/spi/spi_ppc4xx.c | 2 +- drivers/spi/xilinx_spi_of.c | 2 +- drivers/usb/gadget/fsl_qe_udc.c | 7 ++++-- drivers/usb/host/ehci-ppc-of.c | 9 +++----- drivers/usb/host/ehci-xilinx-of.c | 9 +++----- drivers/usb/host/fhci-hcd.c | 7 ++++-- drivers/usb/host/isp1760-if.c | 7 ++++-- drivers/usb/host/ohci-ppc-of.c | 13 +++-------- drivers/video/bw2.c | 7 ++++-- drivers/video/cg14.c | 7 ++++-- drivers/video/cg3.c | 7 ++++-- drivers/video/cg6.c | 7 ++++-- drivers/video/ffb.c | 7 ++++-- drivers/video/fsl-diu-fb.c | 8 ++++--- drivers/video/leo.c | 7 ++++-- drivers/video/mb862xx/mb862xxfb.c | 8 ++++--- drivers/video/p9100.c | 7 ++++-- drivers/video/platinumfb.c | 7 ++++-- drivers/video/tcx.c | 7 ++++-- drivers/video/xilinxfb.c | 5 ++-- drivers/watchdog/cpwd.c | 7 ++++-- drivers/watchdog/gef_wdt.c | 8 ++++--- drivers/watchdog/mpc8xxx_wdt.c | 8 +++---- drivers/watchdog/riowd.c | 7 ++++-- include/linux/device.h | 4 +++ include/linux/of_platform.h | 4 --- sound/soc/fsl/mpc5200_psc_ac97.c | 2 +- sound/soc/fsl/mpc5200_psc_i2s.c | 2 +- sound/soc/fsl/mpc8610_hpcd.c | 8 ++++--- sound/sparc/amd7930.c | 7 ++++-- sound/sparc/cs4231.c | 7 ++++-- sound/sparc/dbri.c | 7 ++++-- 144 files changed, 665 insertions(+), 380 deletions(-)
Signature · 1 line
Signature
PATCH 1/27 drivercore: Add of_match_table to the common device drivers
OF-style matching can be available to any device, on any type of bus. This patch allows any driver to provide an OF match table when CONFIG_OF is enabled so that drivers can be bound against devices described in the device tree.
---
arch/powerpc/kernel/ibmebus.c | 2 +- drivers/macintosh/macio_asic.c | 5 ++--- drivers/of/platform.c | 7 ++++--- include/linux/device.h | 4 ++++ 4 files changed, 11 insertions(+), 7 deletions(-)
arch/powerpc/kernel/ibmebus.c +1 -1
@@ -201,7 +201,7 @@ static int ibmebus_create_devices(const struct of_device_id *matches)int ibmebus_register_driver (struct of_platform_driver *drv) {/* If the driver uses devices that ibmebus doesn't know, add them */ -ibmebus_create_devices (drv->match_table); +ibmebus_create_devices (drv->driver.of_match_table);return of_register_driver (drv, &ibmebus_bus_type); }
drivers/macintosh/macio_asic.c +2 -3
@@ -40,8 +40,7 @@ static struct macio_chip *macio_on_hold;static int macio_bus_match (struct device *dev,struct device_driver *drv) {struct macio_dev * macio_dev =to_macio_device (dev); -struct macio_driver * macio_drv =to_macio_driver (drv); -const struct of_device_id * matches = macio_drv->match_table; +const struct of_device_id * matches = drv->of_match_table;if (!matches)return 0 ;
@@ -84,7 +83,7 @@ static int macio_device_probe(struct device *dev)macio_dev_get (macio_dev); - match =of_match_device (drv->match_table, &macio_dev->ofdev); + match =of_match_device (drv->driver.of_match_table, &macio_dev->ofdev);if (match) error = drv->probe (macio_dev, match);if (error)
drivers/of/platform.c +4 -3
@@ -22,8 +22,7 @@ extern struct device_attribute of_platform_device_attrs[];static int of_platform_bus_match (struct device *dev,struct device_driver *drv) {struct of_device *of_dev =to_of_device (dev); -struct of_platform_driver *of_drv =to_of_platform_driver (drv); -const struct of_device_id *matches = of_drv->match_table; +const struct of_device_id *matches = drv->of_match_table;if (!matches)return 0 ;
@@ -46,7 +45,7 @@ static int of_platform_device_probe(struct device *dev)of_dev_get (of_dev); - match =of_match_device (drv->match_table, of_dev); + match =of_match_device (drv->driver.of_match_table, of_dev);if (match) error = drv->probe (of_dev, match);if (error)
@@ -391,6 +390,8 @@ int of_register_driver(struct of_platform_driver *drv, struct bus_type *bus) 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 */
include/linux/device.h +4 -0
@@ -129,6 +129,10 @@ struct device_driver {bool suppress_bind_attrs;/* disables bind/unbind via sysfs */ +#if defined(CONFIG_OF ) +const struct of_device_id *of_match_table; +#endif +int (*probe) (struct device *dev);int (*remove) (struct device *dev);void (*shutdown) (struct device *dev);
PATCH 1/27 drivercore: Add of_match_table to the common device drivers
In reply to Grant LikelyOF-style matching can be available to any device, on any type of bus. This patch allows any driver to provide an OF match table when CONFIG_OF is enabled so that drivers can be bound against devices described in the device tree.
---
arch/powerpc/kernel/ibmebus.c | 2 +- drivers/macintosh/macio_asic.c | 5 ++--- drivers/of/platform.c | 7 ++++--- include/linux/device.h | 4 ++++ 4 files changed, 11 insertions(+), 7 deletions(-)
arch/powerpc/kernel/ibmebus.c +1 -1
@@ -201,7 +201,7 @@ static int ibmebus_create_devices(const struct of_device_id *matches)int ibmebus_register_driver (struct of_platform_driver *drv) {/* If the driver uses devices that ibmebus doesn't know, add them */ -ibmebus_create_devices (drv->match_table); +ibmebus_create_devices (drv->driver.of_match_table);return of_register_driver (drv, &ibmebus_bus_type); }
drivers/macintosh/macio_asic.c +2 -3
@@ -40,8 +40,7 @@ static struct macio_chip *macio_on_hold;static int macio_bus_match (struct device *dev,struct device_driver *drv) {struct macio_dev * macio_dev =to_macio_device (dev); -struct macio_driver * macio_drv =to_macio_driver (drv); -const struct of_device_id * matches = macio_drv->match_table; +const struct of_device_id * matches = drv->of_match_table;if (!matches)return 0 ;
@@ -84,7 +83,7 @@ static int macio_device_probe(struct device *dev)macio_dev_get (macio_dev); - match =of_match_device (drv->match_table, &macio_dev->ofdev); + match =of_match_device (drv->driver.of_match_table, &macio_dev->ofdev);if (match) error = drv->probe (macio_dev, match);if (error)
drivers/of/platform.c +4 -3
@@ -22,8 +22,7 @@ extern struct device_attribute of_platform_device_attrs[];static int of_platform_bus_match (struct device *dev,struct device_driver *drv) {struct of_device *of_dev =to_of_device (dev); -struct of_platform_driver *of_drv =to_of_platform_driver (drv); -const struct of_device_id *matches = of_drv->match_table; +const struct of_device_id *matches = drv->of_match_table;if (!matches)return 0 ;
@@ -46,7 +45,7 @@ static int of_platform_device_probe(struct device *dev)of_dev_get (of_dev); - match =of_match_device (drv->match_table, of_dev); + match =of_match_device (drv->driver.of_match_table, of_dev);if (match) error = drv->probe (of_dev, match);if (error)
@@ -391,6 +390,8 @@ int of_register_driver(struct of_platform_driver *drv, struct bus_type *bus) 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 */
include/linux/device.h +4 -0
@@ -129,6 +129,10 @@ struct device_driver {bool suppress_bind_attrs;/* disables bind/unbind via sysfs */ +#if defined(CONFIG_OF ) +const struct of_device_id *of_match_table; +#endif +int (*probe) (struct device *dev);int (*remove) (struct device *dev);void (*shutdown) (struct device *dev);
PATCH 1/27 drivercore: Add of_match_table to the common device drivers
In reply to Grant LikelyOF-style matching can be available to any device, on any type of bus. This patch allows any driver to provide an OF match table when CONFIG_OF is enabled so that drivers can be bound against devices described in the device tree.
---
arch/powerpc/kernel/ibmebus.c | 2 +- drivers/macintosh/macio_asic.c | 5 ++--- drivers/of/platform.c | 7 ++++--- include/linux/device.h | 4 ++++ 4 files changed, 11 insertions(+), 7 deletions(-)
arch/powerpc/kernel/ibmebus.c +1 -1
@@ -201,7 +201,7 @@ static int ibmebus_create_devices(const struct of_device_id *matches)int ibmebus_register_driver (struct of_platform_driver *drv) {/* If the driver uses devices that ibmebus doesn't know, add them */ -ibmebus_create_devices (drv->match_table); +ibmebus_create_devices (drv->driver.of_match_table);return of_register_driver (drv, &ibmebus_bus_type); }
drivers/macintosh/macio_asic.c +2 -3
@@ -40,8 +40,7 @@ static struct macio_chip *macio_on_hold;static int macio_bus_match (struct device *dev,struct device_driver *drv) {struct macio_dev * macio_dev =to_macio_device (dev); -struct macio_driver * macio_drv =to_macio_driver (drv); -const struct of_device_id * matches = macio_drv->match_table; +const struct of_device_id * matches = drv->of_match_table;if (!matches)return 0 ;
@@ -84,7 +83,7 @@ static int macio_device_probe(struct device *dev)macio_dev_get (macio_dev); - match =of_match_device (drv->match_table, &macio_dev->ofdev); + match =of_match_device (drv->driver.of_match_table, &macio_dev->ofdev);if (match) error = drv->probe (macio_dev, match);if (error)
drivers/of/platform.c +4 -3
@@ -22,8 +22,7 @@ extern struct device_attribute of_platform_device_attrs[];static int of_platform_bus_match (struct device *dev,struct device_driver *drv) {struct of_device *of_dev =to_of_device (dev); -struct of_platform_driver *of_drv =to_of_platform_driver (drv); -const struct of_device_id *matches = of_drv->match_table; +const struct of_device_id *matches = drv->of_match_table;if (!matches)return 0 ;
@@ -46,7 +45,7 @@ static int of_platform_device_probe(struct device *dev)of_dev_get (of_dev); - match =of_match_device (drv->match_table, of_dev); + match =of_match_device (drv->driver.of_match_table, of_dev);if (match) error = drv->probe (of_dev, match);if (error)
@@ -391,6 +390,8 @@ int of_register_driver(struct of_platform_driver *drv, struct bus_type *bus) 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 */
include/linux/device.h +4 -0
@@ -129,6 +129,10 @@ struct device_driver {bool suppress_bind_attrs;/* disables bind/unbind via sysfs */ +#if defined(CONFIG_OF ) +const struct of_device_id *of_match_table; +#endif +int (*probe) (struct device *dev);int (*remove) (struct device *dev);void (*shutdown) (struct device *dev);
PATCH 2/27 drivers/gpio/of: don't use deprecated fields in of_platform_driver
In reply to Grant Likely.name, .match_table and .owner are duplicated in both of_platform_driver and device_driver, so the of_platform_driver copies will be removed soon.
---
drivers/leds/leds-gpio.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
drivers/leds/leds-gpio.c +1 -1
@@ -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), };
PATCH 1/27 drivercore: Add of_match_table to the common device drivers
In reply to Grant LikelyOF-style matching can be available to any device, on any type of bus. This patch allows any driver to provide an OF match table when CONFIG_OF is enabled so that drivers can be bound against devices described in the device tree.
---
arch/powerpc/kernel/ibmebus.c | 2 +- drivers/macintosh/macio_asic.c | 5 ++--- drivers/of/platform.c | 7 ++++--- include/linux/device.h | 4 ++++ 4 files changed, 11 insertions(+), 7 deletions(-)
arch/powerpc/kernel/ibmebus.c +1 -1
@@ -201,7 +201,7 @@ static int ibmebus_create_devices(const struct of_device_id *matches)int ibmebus_register_driver (struct of_platform_driver *drv) {/* If the driver uses devices that ibmebus doesn't know, add them */ -ibmebus_create_devices (drv->match_table); +ibmebus_create_devices (drv->driver.of_match_table);return of_register_driver (drv, &ibmebus_bus_type); }
drivers/macintosh/macio_asic.c +2 -3
@@ -40,8 +40,7 @@ static struct macio_chip *macio_on_hold;static int macio_bus_match (struct device *dev,struct device_driver *drv) {struct macio_dev * macio_dev =to_macio_device (dev); -struct macio_driver * macio_drv =to_macio_driver (drv); -const struct of_device_id * matches = macio_drv->match_table; +const struct of_device_id * matches = drv->of_match_table;if (!matches)return 0 ;
@@ -84,7 +83,7 @@ static int macio_device_probe(struct device *dev)macio_dev_get (macio_dev); - match =of_match_device (drv->match_table, &macio_dev->ofdev); + match =of_match_device (drv->driver.of_match_table, &macio_dev->ofdev);if (match) error = drv->probe (macio_dev, match);if (error)
drivers/of/platform.c +4 -3
@@ -22,8 +22,7 @@ extern struct device_attribute of_platform_device_attrs[];static int of_platform_bus_match (struct device *dev,struct device_driver *drv) {struct of_device *of_dev =to_of_device (dev); -struct of_platform_driver *of_drv =to_of_platform_driver (drv); -const struct of_device_id *matches = of_drv->match_table; +const struct of_device_id *matches = drv->of_match_table;if (!matches)return 0 ;
@@ -46,7 +45,7 @@ static int of_platform_device_probe(struct device *dev)of_dev_get (of_dev); - match =of_match_device (drv->match_table, of_dev); + match =of_match_device (drv->driver.of_match_table, of_dev);if (match) error = drv->probe (of_dev, match);if (error)
@@ -391,6 +390,8 @@ int of_register_driver(struct of_platform_driver *drv, struct bus_type *bus) 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 */
include/linux/device.h +4 -0
@@ -129,6 +129,10 @@ struct device_driver {bool suppress_bind_attrs;/* disables bind/unbind via sysfs */ +#if defined(CONFIG_OF ) +const struct of_device_id *of_match_table; +#endif +int (*probe) (struct device *dev);int (*remove) (struct device *dev);void (*shutdown) (struct device *dev);
PATCH 3/27 drivers/watchdog/of: don't use deprecated .name and .owner in of_platform_driver
In reply to Grant Likely.name, .match_table and .owner are duplicated in both of_platform_driver and device_driver, so the of_platform_driver copies will be removed soon.
---
drivers/watchdog/cpwd.c | 7 +++++-- drivers/watchdog/gef_wdt.c | 8 +++++--- drivers/watchdog/mpc8xxx_wdt.c | 8 ++++---- drivers/watchdog/riowd.c | 7 +++++-- 4 files changed, 19 insertions(+), 11 deletions(-)
drivers/watchdog/cpwd.c +5 -2
@@ -676,8 +676,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), };
drivers/watchdog/gef_wdt.c +5 -3
@@ -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, };
drivers/watchdog/mpc8xxx_wdt.c +4 -4
@@ -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, }, };
drivers/watchdog/riowd.c +5 -2
@@ -238,8 +238,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), };
PATCH 1/27 drivercore: Add of_match_table to the common device drivers
In reply to Grant LikelyOF-style matching can be available to any device, on any type of bus. This patch allows any driver to provide an OF match table when CONFIG_OF is enabled so that drivers can be bound against devices described in the device tree.
---
arch/powerpc/kernel/ibmebus.c | 2 +- drivers/macintosh/macio_asic.c | 5 ++--- drivers/of/platform.c | 7 ++++--- include/linux/device.h | 4 ++++ 4 files changed, 11 insertions(+), 7 deletions(-)
arch/powerpc/kernel/ibmebus.c +1 -1
@@ -201,7 +201,7 @@ static int ibmebus_create_devices(const struct of_device_id *matches)int ibmebus_register_driver (struct of_platform_driver *drv) {/* If the driver uses devices that ibmebus doesn't know, add them */ -ibmebus_create_devices (drv->match_table); +ibmebus_create_devices (drv->driver.of_match_table);return of_register_driver (drv, &ibmebus_bus_type); }
drivers/macintosh/macio_asic.c +2 -3
@@ -40,8 +40,7 @@ static struct macio_chip *macio_on_hold;static int macio_bus_match (struct device *dev,struct device_driver *drv) {struct macio_dev * macio_dev =to_macio_device (dev); -struct macio_driver * macio_drv =to_macio_driver (drv); -const struct of_device_id * matches = macio_drv->match_table; +const struct of_device_id * matches = drv->of_match_table;if (!matches)return 0 ;
@@ -84,7 +83,7 @@ static int macio_device_probe(struct device *dev)macio_dev_get (macio_dev); - match =of_match_device (drv->match_table, &macio_dev->ofdev); + match =of_match_device (drv->driver.of_match_table, &macio_dev->ofdev);if (match) error = drv->probe (macio_dev, match);if (error)
drivers/of/platform.c +4 -3
@@ -22,8 +22,7 @@ extern struct device_attribute of_platform_device_attrs[];static int of_platform_bus_match (struct device *dev,struct device_driver *drv) {struct of_device *of_dev =to_of_device (dev); -struct of_platform_driver *of_drv =to_of_platform_driver (drv); -const struct of_device_id *matches = of_drv->match_table; +const struct of_device_id *matches = drv->of_match_table;if (!matches)return 0 ;
@@ -46,7 +45,7 @@ static int of_platform_device_probe(struct device *dev)of_dev_get (of_dev); - match =of_match_device (drv->match_table, of_dev); + match =of_match_device (drv->driver.of_match_table, of_dev);if (match) error = drv->probe (of_dev, match);if (error)
@@ -391,6 +390,8 @@ int of_register_driver(struct of_platform_driver *drv, struct bus_type *bus) 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 */
include/linux/device.h +4 -0
@@ -129,6 +129,10 @@ struct device_driver {bool suppress_bind_attrs;/* disables bind/unbind via sysfs */ +#if defined(CONFIG_OF ) +const struct of_device_id *of_match_table; +#endif +int (*probe) (struct device *dev);int (*remove) (struct device *dev);void (*shutdown) (struct device *dev);
PATCH 4/27 drivers/video/of: don't use deprecated field in of_platform_driver
In reply to Grant Likely.name, .match_table and .owner are duplicated in both of_platform_driver and device_driver, so the of_platform_driver copies will be removed soon.
---
drivers/video/bw2.c | 7 +++++-- drivers/video/cg14.c | 7 +++++-- drivers/video/cg3.c | 7 +++++-- drivers/video/cg6.c | 7 +++++-- drivers/video/ffb.c | 7 +++++-- drivers/video/fsl-diu-fb.c | 8 +++++--- drivers/video/leo.c | 7 +++++-- drivers/video/mb862xx/mb862xxfb.c | 8 +++++--- drivers/video/p9100.c | 7 +++++-- drivers/video/platinumfb.c | 7 +++++-- drivers/video/tcx.c | 7 +++++-- drivers/video/xilinxfb.c | 5 ++--- 12 files changed, 57 insertions(+), 27 deletions(-)
drivers/video/bw2.c +5 -2
@@ -377,8 +377,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), };
drivers/video/cg14.c +5 -2
@@ -597,8 +597,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), };
drivers/video/cg3.c +5 -2
@@ -464,8 +464,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), };
drivers/video/cg6.c +5 -2
@@ -857,8 +857,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), };
drivers/video/ffb.c +5 -2
@@ -1054,8 +1054,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), };
drivers/video/fsl-diu-fb.c +5 -3
@@ -1646,9 +1646,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,
drivers/video/leo.c +5 -2
@@ -664,8 +664,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), };
drivers/video/mb862xx/mb862xxfb.c +5 -3
@@ -731,9 +731,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), };
drivers/video/p9100.c +5 -2
@@ -354,8 +354,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), };
drivers/video/platinumfb.c +5 -2
@@ -680,8 +680,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, };
drivers/video/tcx.c +5 -2
@@ -513,8 +513,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), };
drivers/video/xilinxfb.c +2 -3
@@ -491,13 +491,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, }, };
PATCH 2/27 drivers/gpio/of: don't use deprecated fields in of_platform_driver
In reply to Grant Likely.name, .match_table and .owner are duplicated in both of_platform_driver and device_driver, so the of_platform_driver copies will be removed soon.
---
drivers/leds/leds-gpio.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
drivers/leds/leds-gpio.c +1 -1
@@ -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), };
PATCH 5/27 drivers/usb/of: don't use deprecated field in of_platform_driver
In reply to Grant Likely.name, .match_table and .owner are duplicated in both of_platform_driver and device_driver, so the of_platform_driver copies will be removed soon.
---
drivers/usb/gadget/fsl_qe_udc.c | 7 +++++-- drivers/usb/host/ehci-ppc-of.c | 9 ++++----- drivers/usb/host/ehci-xilinx-of.c | 9 ++++----- drivers/usb/host/fhci-hcd.c | 7 +++++-- drivers/usb/host/isp1760-if.c | 7 +++++-- drivers/usb/host/ohci-ppc-of.c | 13 ++++--------- 6 files changed, 27 insertions(+), 25 deletions(-)
drivers/usb/gadget/fsl_qe_udc.c +5 -2
@@ -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
drivers/usb/host/ehci-ppc-of.c +4 -5
@@ -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, }, };
drivers/usb/host/ehci-xilinx-of.c +4 -5
@@ -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, }, };
drivers/usb/host/fhci-hcd.c +5 -2
@@ -812,8 +812,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), };
drivers/usb/host/isp1760-if.c +5 -2
@@ -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, };
drivers/usb/host/ohci-ppc-of.c +4 -9
@@ -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, }, };
PATCH 2/27 drivers/gpio/of: don't use deprecated fields in of_platform_driver
In reply to Grant Likely.name, .match_table and .owner are duplicated in both of_platform_driver and device_driver, so the of_platform_driver copies will be removed soon.
---
drivers/leds/leds-gpio.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
drivers/leds/leds-gpio.c +1 -1
@@ -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), };
PATCH 6/27 drivers/block/of: don't use deprecated field in of_platform_driver
In reply to Grant Likely.name, .match_table and .owner are duplicated in both of_platform_driver and device_driver, so the of_platform_driver copies will be removed soon.
---
drivers/ata/pata_of_platform.c | 7 +++++-- drivers/ata/sata_fsl.c | 7 +++++-- drivers/block/xsysace.c | 5 ++--- 3 files changed, 12 insertions(+), 7 deletions(-)
drivers/ata/pata_of_platform.c +5 -2
@@ -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), };
drivers/ata/sata_fsl.c +5 -2
@@ -1426,8 +1426,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
drivers/block/xsysace.c +2 -3
@@ -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, }, };
PATCH 2/27 drivers/gpio/of: don't use deprecated fields in of_platform_driver
In reply to Grant Likely.name, .match_table and .owner are duplicated in both of_platform_driver and device_driver, so the of_platform_driver copies will be removed soon.
---
drivers/leds/leds-gpio.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
drivers/leds/leds-gpio.c +1 -1
@@ -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), };
PATCH 2/27 drivers/gpio/of: don't use deprecated fields in of_platform_driver
In reply to Grant Likely.name, .match_table and .owner are duplicated in both of_platform_driver and device_driver, so the of_platform_driver copies will be removed soon.
---
drivers/leds/leds-gpio.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
drivers/leds/leds-gpio.c +1 -1
@@ -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), };
PATCH 7/27 drivers/char/of: don't use deprecated field in of_platform_driver
In reply to Grant Likely.name, .match_table and .owner are duplicated in both of_platform_driver and device_driver, so the of_platform_driver copies will be removed soon.
---
drivers/char/hw_random/n2-drv.c | 7 +++++-- drivers/char/hw_random/pasemi-rng.c | 7 +++++-- drivers/char/ipmi/ipmi_si_intf.c | 7 +++++-- drivers/char/xilinx_hwicap/xilinx_hwicap.c | 5 ++--- 4 files changed, 17 insertions(+), 9 deletions(-)
drivers/char/hw_random/n2-drv.c +5 -2
@@ -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), };
drivers/char/hw_random/pasemi-rng.c +5 -2
@@ -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, };
drivers/char/ipmi/ipmi_si_intf.c +5 -2
@@ -2492,8 +2492,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), };
drivers/char/xilinx_hwicap/xilinx_hwicap.c +2 -3
@@ -811,13 +811,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, }, };
PATCH 3/27 drivers/watchdog/of: don't use deprecated .name and .owner in of_platform_driver
In reply to Grant Likely.name, .match_table and .owner are duplicated in both of_platform_driver and device_driver, so the of_platform_driver copies will be removed soon.
---
drivers/watchdog/cpwd.c | 7 +++++-- drivers/watchdog/gef_wdt.c | 8 +++++--- drivers/watchdog/mpc8xxx_wdt.c | 8 ++++---- drivers/watchdog/riowd.c | 7 +++++-- 4 files changed, 19 insertions(+), 11 deletions(-)
drivers/watchdog/cpwd.c +5 -2
@@ -676,8 +676,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), };
drivers/watchdog/gef_wdt.c +5 -3
@@ -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, };
drivers/watchdog/mpc8xxx_wdt.c +4 -4
@@ -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, }, };
drivers/watchdog/riowd.c +5 -2
@@ -238,8 +238,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), };
PATCH 3/27 drivers/watchdog/of: don't use deprecated .name and .owner in of_platform_driver
In reply to Grant Likely.name, .match_table and .owner are duplicated in both of_platform_driver and device_driver, so the of_platform_driver copies will be removed soon.
---
drivers/watchdog/cpwd.c | 7 +++++-- drivers/watchdog/gef_wdt.c | 8 +++++--- drivers/watchdog/mpc8xxx_wdt.c | 8 ++++---- drivers/watchdog/riowd.c | 7 +++++-- 4 files changed, 19 insertions(+), 11 deletions(-)
drivers/watchdog/cpwd.c +5 -2
@@ -676,8 +676,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), };
drivers/watchdog/gef_wdt.c +5 -3
@@ -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, };
drivers/watchdog/mpc8xxx_wdt.c +4 -4
@@ -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, }, };
drivers/watchdog/riowd.c +5 -2
@@ -238,8 +238,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), };
PATCH 3/27 drivers/watchdog/of: don't use deprecated .name and .owner in of_platform_driver
In reply to Grant Likely.name, .match_table and .owner are duplicated in both of_platform_driver and device_driver, so the of_platform_driver copies will be removed soon.
---
drivers/watchdog/cpwd.c | 7 +++++-- drivers/watchdog/gef_wdt.c | 8 +++++--- drivers/watchdog/mpc8xxx_wdt.c | 8 ++++---- drivers/watchdog/riowd.c | 7 +++++-- 4 files changed, 19 insertions(+), 11 deletions(-)
drivers/watchdog/cpwd.c +5 -2
@@ -676,8 +676,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), };
drivers/watchdog/gef_wdt.c +5 -3
@@ -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, };
drivers/watchdog/mpc8xxx_wdt.c +4 -4
@@ -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, }, };
drivers/watchdog/riowd.c +5 -2
@@ -238,8 +238,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), };
PATCH 3/27 drivers/watchdog/of: don't use deprecated .name and .owner in of_platform_driver
In reply to Grant Likely.name, .match_table and .owner are duplicated in both of_platform_driver and device_driver, so the of_platform_driver copies will be removed soon.
---
drivers/watchdog/cpwd.c | 7 +++++-- drivers/watchdog/gef_wdt.c | 8 +++++--- drivers/watchdog/mpc8xxx_wdt.c | 8 ++++---- drivers/watchdog/riowd.c | 7 +++++-- 4 files changed, 19 insertions(+), 11 deletions(-)
drivers/watchdog/cpwd.c +5 -2
@@ -676,8 +676,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), };
drivers/watchdog/gef_wdt.c +5 -3
@@ -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, };
drivers/watchdog/mpc8xxx_wdt.c +4 -4
@@ -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, }, };
drivers/watchdog/riowd.c +5 -2
@@ -238,8 +238,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), };
PATCH 4/27 drivers/video/of: don't use deprecated field in of_platform_driver
In reply to Grant Likely.name, .match_table and .owner are duplicated in both of_platform_driver and device_driver, so the of_platform_driver copies will be removed soon.
---
drivers/video/bw2.c | 7 +++++-- drivers/video/cg14.c | 7 +++++-- drivers/video/cg3.c | 7 +++++-- drivers/video/cg6.c | 7 +++++-- drivers/video/ffb.c | 7 +++++-- drivers/video/fsl-diu-fb.c | 8 +++++--- drivers/video/leo.c | 7 +++++-- drivers/video/mb862xx/mb862xxfb.c | 8 +++++--- drivers/video/p9100.c | 7 +++++-- drivers/video/platinumfb.c | 7 +++++-- drivers/video/tcx.c | 7 +++++-- drivers/video/xilinxfb.c | 5 ++--- 12 files changed, 57 insertions(+), 27 deletions(-)
drivers/video/bw2.c +5 -2
@@ -377,8 +377,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), };
drivers/video/cg14.c +5 -2
@@ -597,8 +597,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), };
drivers/video/cg3.c +5 -2
@@ -464,8 +464,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), };
drivers/video/cg6.c +5 -2
@@ -857,8 +857,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), };
drivers/video/ffb.c +5 -2
@@ -1054,8 +1054,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), };
drivers/video/fsl-diu-fb.c +5 -3
@@ -1646,9 +1646,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,
drivers/video/leo.c +5 -2
@@ -664,8 +664,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), };
drivers/video/mb862xx/mb862xxfb.c +5 -3
@@ -731,9 +731,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), };
drivers/video/p9100.c +5 -2
@@ -354,8 +354,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), };
drivers/video/platinumfb.c +5 -2
@@ -680,8 +680,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, };
drivers/video/tcx.c +5 -2
@@ -513,8 +513,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), };
drivers/video/xilinxfb.c +2 -3
@@ -491,13 +491,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, }, };
PATCH 8/27 drivers/crypto/of: don't use deprecated field in of_platform_driver
In reply to Grant Likely.name, .match_table and .owner are duplicated in both of_platform_driver and device_driver, so the of_platform_driver copies will be removed soon.
---
drivers/crypto/amcc/crypto4xx_core.c | 7 +++++-- drivers/crypto/talitos.c | 7 +++++-- 2 files changed, 10 insertions(+), 4 deletions(-)
drivers/crypto/amcc/crypto4xx_core.c +5 -2
@@ -1280,8 +1280,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, };
drivers/crypto/talitos.c +5 -2
@@ -1967,8 +1967,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, };
PATCH 4/27 drivers/video/of: don't use deprecated field in of_platform_driver
In reply to Grant Likely.name, .match_table and .owner are duplicated in both of_platform_driver and device_driver, so the of_platform_driver copies will be removed soon.
---
drivers/video/bw2.c | 7 +++++-- drivers/video/cg14.c | 7 +++++-- drivers/video/cg3.c | 7 +++++-- drivers/video/cg6.c | 7 +++++-- drivers/video/ffb.c | 7 +++++-- drivers/video/fsl-diu-fb.c | 8 +++++--- drivers/video/leo.c | 7 +++++-- drivers/video/mb862xx/mb862xxfb.c | 8 +++++--- drivers/video/p9100.c | 7 +++++-- drivers/video/platinumfb.c | 7 +++++-- drivers/video/tcx.c | 7 +++++-- drivers/video/xilinxfb.c | 5 ++--- 12 files changed, 57 insertions(+), 27 deletions(-)
drivers/video/bw2.c +5 -2
@@ -377,8 +377,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), };
drivers/video/cg14.c +5 -2
@@ -597,8 +597,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), };
drivers/video/cg3.c +5 -2
@@ -464,8 +464,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), };
drivers/video/cg6.c +5 -2
@@ -857,8 +857,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), };
drivers/video/ffb.c +5 -2
@@ -1054,8 +1054,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), };
drivers/video/fsl-diu-fb.c +5 -3
@@ -1646,9 +1646,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,
drivers/video/leo.c +5 -2
@@ -664,8 +664,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), };
drivers/video/mb862xx/mb862xxfb.c +5 -3
@@ -731,9 +731,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), };
drivers/video/p9100.c +5 -2
@@ -354,8 +354,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), };
drivers/video/platinumfb.c +5 -2
@@ -680,8 +680,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, };
drivers/video/tcx.c +5 -2
@@ -513,8 +513,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), };
drivers/video/xilinxfb.c +2 -3
@@ -491,13 +491,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, }, };
PATCH 4/27 drivers/video/of: don't use deprecated field in of_platform_driver
In reply to Grant Likely.name, .match_table and .owner are duplicated in both of_platform_driver and device_driver, so the of_platform_driver copies will be removed soon.
---
drivers/video/bw2.c | 7 +++++-- drivers/video/cg14.c | 7 +++++-- drivers/video/cg3.c | 7 +++++-- drivers/video/cg6.c | 7 +++++-- drivers/video/ffb.c | 7 +++++-- drivers/video/fsl-diu-fb.c | 8 +++++--- drivers/video/leo.c | 7 +++++-- drivers/video/mb862xx/mb862xxfb.c | 8 +++++--- drivers/video/p9100.c | 7 +++++-- drivers/video/platinumfb.c | 7 +++++-- drivers/video/tcx.c | 7 +++++-- drivers/video/xilinxfb.c | 5 ++--- 12 files changed, 57 insertions(+), 27 deletions(-)
drivers/video/bw2.c +5 -2
@@ -377,8 +377,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), };
drivers/video/cg14.c +5 -2
@@ -597,8 +597,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), };
drivers/video/cg3.c +5 -2
@@ -464,8 +464,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), };
drivers/video/cg6.c +5 -2
@@ -857,8 +857,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), };
drivers/video/ffb.c +5 -2
@@ -1054,8 +1054,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), };
drivers/video/fsl-diu-fb.c +5 -3
@@ -1646,9 +1646,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,
drivers/video/leo.c +5 -2
@@ -664,8 +664,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), };
drivers/video/mb862xx/mb862xxfb.c +5 -3
@@ -731,9 +731,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), };
drivers/video/p9100.c +5 -2
@@ -354,8 +354,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), };
drivers/video/platinumfb.c +5 -2
@@ -680,8 +680,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, };
drivers/video/tcx.c +5 -2
@@ -513,8 +513,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), };
drivers/video/xilinxfb.c +2 -3
@@ -491,13 +491,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, }, };
PATCH 4/27 drivers/video/of: don't use deprecated field in of_platform_driver
In reply to Grant Likely.name, .match_table and .owner are duplicated in both of_platform_driver and device_driver, so the of_platform_driver copies will be removed soon.
---
drivers/video/bw2.c | 7 +++++-- drivers/video/cg14.c | 7 +++++-- drivers/video/cg3.c | 7 +++++-- drivers/video/cg6.c | 7 +++++-- drivers/video/ffb.c | 7 +++++-- drivers/video/fsl-diu-fb.c | 8 +++++--- drivers/video/leo.c | 7 +++++-- drivers/video/mb862xx/mb862xxfb.c | 8 +++++--- drivers/video/p9100.c | 7 +++++-- drivers/video/platinumfb.c | 7 +++++-- drivers/video/tcx.c | 7 +++++-- drivers/video/xilinxfb.c | 5 ++--- 12 files changed, 57 insertions(+), 27 deletions(-)
drivers/video/bw2.c +5 -2
@@ -377,8 +377,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), };
drivers/video/cg14.c +5 -2
@@ -597,8 +597,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), };
drivers/video/cg3.c +5 -2
@@ -464,8 +464,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), };
drivers/video/cg6.c +5 -2
@@ -857,8 +857,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), };
drivers/video/ffb.c +5 -2
@@ -1054,8 +1054,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), };
drivers/video/fsl-diu-fb.c +5 -3
@@ -1646,9 +1646,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,
drivers/video/leo.c +5 -2
@@ -664,8 +664,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), };
drivers/video/mb862xx/mb862xxfb.c +5 -3
@@ -731,9 +731,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), };
drivers/video/p9100.c +5 -2
@@ -354,8 +354,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), };
drivers/video/platinumfb.c +5 -2
@@ -680,8 +680,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, };
drivers/video/tcx.c +5 -2
@@ -513,8 +513,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), };
drivers/video/xilinxfb.c +2 -3
@@ -491,13 +491,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, }, };
PATCH 5/27 drivers/usb/of: don't use deprecated field in of_platform_driver
In reply to Grant Likely.name, .match_table and .owner are duplicated in both of_platform_driver and device_driver, so the of_platform_driver copies will be removed soon.
---
drivers/usb/gadget/fsl_qe_udc.c | 7 +++++-- drivers/usb/host/ehci-ppc-of.c | 9 ++++----- drivers/usb/host/ehci-xilinx-of.c | 9 ++++----- drivers/usb/host/fhci-hcd.c | 7 +++++-- drivers/usb/host/isp1760-if.c | 7 +++++-- drivers/usb/host/ohci-ppc-of.c | 13 ++++--------- 6 files changed, 27 insertions(+), 25 deletions(-)
drivers/usb/gadget/fsl_qe_udc.c +5 -2
@@ -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
drivers/usb/host/ehci-ppc-of.c +4 -5
@@ -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, }, };
drivers/usb/host/ehci-xilinx-of.c +4 -5
@@ -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, }, };
drivers/usb/host/fhci-hcd.c +5 -2
@@ -812,8 +812,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), };
drivers/usb/host/isp1760-if.c +5 -2
@@ -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, };
drivers/usb/host/ohci-ppc-of.c +4 -9
@@ -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, }, };
Re: [PATCH 05/27] drivers/usb/of: don't use deprecated field in of_platform_driver
Quoted 4 lines · Grant Likely
.name, .match_table and .owner are duplicated in both
of_platform_driveranddevice_driver, so theof_platform_drivercopies will be removed soon.Signed-off-by Grant Likely <[email protected]>
PATCH 5/27 drivers/usb/of: don't use deprecated field in of_platform_driver
In reply to Grant Likely.name, .match_table and .owner are duplicated in both of_platform_driver and device_driver, so the of_platform_driver copies will be removed soon.
---
drivers/usb/gadget/fsl_qe_udc.c | 7 +++++-- drivers/usb/host/ehci-ppc-of.c | 9 ++++----- drivers/usb/host/ehci-xilinx-of.c | 9 ++++----- drivers/usb/host/fhci-hcd.c | 7 +++++-- drivers/usb/host/isp1760-if.c | 7 +++++-- drivers/usb/host/ohci-ppc-of.c | 13 ++++--------- 6 files changed, 27 insertions(+), 25 deletions(-)
drivers/usb/gadget/fsl_qe_udc.c +5 -2
@@ -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
drivers/usb/host/ehci-ppc-of.c +4 -5
@@ -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, }, };
drivers/usb/host/ehci-xilinx-of.c +4 -5
@@ -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, }, };
drivers/usb/host/fhci-hcd.c +5 -2
@@ -812,8 +812,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), };
drivers/usb/host/isp1760-if.c +5 -2
@@ -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, };
drivers/usb/host/ohci-ppc-of.c +4 -9
@@ -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, }, };
PATCH 5/27 drivers/usb/of: don't use deprecated field in of_platform_driver
In reply to Grant Likely.name, .match_table and .owner are duplicated in both of_platform_driver and device_driver, so the of_platform_driver copies will be removed soon.
---
drivers/usb/gadget/fsl_qe_udc.c | 7 +++++-- drivers/usb/host/ehci-ppc-of.c | 9 ++++----- drivers/usb/host/ehci-xilinx-of.c | 9 ++++----- drivers/usb/host/fhci-hcd.c | 7 +++++-- drivers/usb/host/isp1760-if.c | 7 +++++-- drivers/usb/host/ohci-ppc-of.c | 13 ++++--------- 6 files changed, 27 insertions(+), 25 deletions(-)
drivers/usb/gadget/fsl_qe_udc.c +5 -2
@@ -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
drivers/usb/host/ehci-ppc-of.c +4 -5
@@ -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, }, };
drivers/usb/host/ehci-xilinx-of.c +4 -5
@@ -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, }, };
drivers/usb/host/fhci-hcd.c +5 -2
@@ -812,8 +812,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), };
drivers/usb/host/isp1760-if.c +5 -2
@@ -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, };
drivers/usb/host/ohci-ppc-of.c +4 -9
@@ -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, }, };
PATCH 5/27 drivers/usb/of: don't use deprecated field in of_platform_driver
In reply to Grant Likely.name, .match_table and .owner are duplicated in both of_platform_driver and device_driver, so the of_platform_driver copies will be removed soon.
---
drivers/usb/gadget/fsl_qe_udc.c | 7 +++++-- drivers/usb/host/ehci-ppc-of.c | 9 ++++----- drivers/usb/host/ehci-xilinx-of.c | 9 ++++----- drivers/usb/host/fhci-hcd.c | 7 +++++-- drivers/usb/host/isp1760-if.c | 7 +++++-- drivers/usb/host/ohci-ppc-of.c | 13 ++++--------- 6 files changed, 27 insertions(+), 25 deletions(-)
drivers/usb/gadget/fsl_qe_udc.c +5 -2
@@ -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
drivers/usb/host/ehci-ppc-of.c +4 -5
@@ -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, }, };
drivers/usb/host/ehci-xilinx-of.c +4 -5
@@ -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, }, };
drivers/usb/host/fhci-hcd.c +5 -2
@@ -812,8 +812,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), };
drivers/usb/host/isp1760-if.c +5 -2
@@ -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, };
drivers/usb/host/ohci-ppc-of.c +4 -9
@@ -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, }, };
PATCH 9/27 drivers/atm/of: don't use deprecated field in of_platform_driver
In reply to Grant Likely.name, .match_table and .owner are duplicated in both of_platform_driver and device_driver, so the of_platform_driver copies will be removed soon.
---
drivers/atm/fore200e.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-)
drivers/atm/fore200e.c +5 -2
@@ -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), };
PATCH 6/27 drivers/block/of: don't use deprecated field in of_platform_driver
In reply to Grant Likely.name, .match_table and .owner are duplicated in both of_platform_driver and device_driver, so the of_platform_driver copies will be removed soon.
---
drivers/ata/pata_of_platform.c | 7 +++++-- drivers/ata/sata_fsl.c | 7 +++++-- drivers/block/xsysace.c | 5 ++--- 3 files changed, 12 insertions(+), 7 deletions(-)
drivers/ata/pata_of_platform.c +5 -2
@@ -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), };
drivers/ata/sata_fsl.c +5 -2
@@ -1426,8 +1426,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
drivers/block/xsysace.c +2 -3
@@ -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, }, };
PATCH 6/27 drivers/block/of: don't use deprecated field in of_platform_driver
In reply to Grant Likely.name, .match_table and .owner are duplicated in both of_platform_driver and device_driver, so the of_platform_driver copies will be removed soon.
---
drivers/ata/pata_of_platform.c | 7 +++++-- drivers/ata/sata_fsl.c | 7 +++++-- drivers/block/xsysace.c | 5 ++--- 3 files changed, 12 insertions(+), 7 deletions(-)
drivers/ata/pata_of_platform.c +5 -2
@@ -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), };
drivers/ata/sata_fsl.c +5 -2
@@ -1426,8 +1426,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
drivers/block/xsysace.c +2 -3
@@ -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, }, };
PATCH 6/27 drivers/block/of: don't use deprecated field in of_platform_driver
In reply to Grant Likely.name, .match_table and .owner are duplicated in both of_platform_driver and device_driver, so the of_platform_driver copies will be removed soon.
---
drivers/ata/pata_of_platform.c | 7 +++++-- drivers/ata/sata_fsl.c | 7 +++++-- drivers/block/xsysace.c | 5 ++--- 3 files changed, 12 insertions(+), 7 deletions(-)
drivers/ata/pata_of_platform.c +5 -2
@@ -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), };
drivers/ata/sata_fsl.c +5 -2
@@ -1426,8 +1426,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
drivers/block/xsysace.c +2 -3
@@ -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, }, };
PATCH 6/27 drivers/block/of: don't use deprecated field in of_platform_driver
In reply to Grant Likely.name, .match_table and .owner are duplicated in both of_platform_driver and device_driver, so the of_platform_driver copies will be removed soon.
---
drivers/ata/pata_of_platform.c | 7 +++++-- drivers/ata/sata_fsl.c | 7 +++++-- drivers/block/xsysace.c | 5 ++--- 3 files changed, 12 insertions(+), 7 deletions(-)
drivers/ata/pata_of_platform.c +5 -2
@@ -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), };
drivers/ata/sata_fsl.c +5 -2
@@ -1426,8 +1426,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
drivers/block/xsysace.c +2 -3
@@ -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, }, };
PATCH 10/27 drivers/input/of: don't use deprecated field in of_platform_driver
In reply to Grant Likely.name, .match_table and .owner are duplicated in both of_platform_driver and device_driver, so the of_platform_driver copies will be removed soon.
---
drivers/input/misc/sparcspkr.c | 14 ++++++++++---- drivers/input/serio/i8042-sparcio.h | 7 +++++-- drivers/input/serio/xilinx_ps2.c | 7 +++++-- 3 files changed, 20 insertions(+), 8 deletions(-)
drivers/input/misc/sparcspkr.c +10 -4
@@ -258,8 +258,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,
@@ -337,8 +340,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,
drivers/input/serio/i8042-sparcio.h +5 -2
@@ -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), };
drivers/input/serio/xilinx_ps2.c +5 -2
@@ -361,8 +361,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), };
PATCH 6/27 drivers/block/of: don't use deprecated field in of_platform_driver
In reply to Grant Likely.name, .match_table and .owner are duplicated in both of_platform_driver and device_driver, so the of_platform_driver copies will be removed soon.
---
drivers/ata/pata_of_platform.c | 7 +++++-- drivers/ata/sata_fsl.c | 7 +++++-- drivers/block/xsysace.c | 5 ++--- 3 files changed, 12 insertions(+), 7 deletions(-)
drivers/ata/pata_of_platform.c +5 -2
@@ -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), };
drivers/ata/sata_fsl.c +5 -2
@@ -1426,8 +1426,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
drivers/block/xsysace.c +2 -3
@@ -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, }, };
PATCH 7/27 drivers/char/of: don't use deprecated field in of_platform_driver
In reply to Grant Likely.name, .match_table and .owner are duplicated in both of_platform_driver and device_driver, so the of_platform_driver copies will be removed soon.
---
drivers/char/hw_random/n2-drv.c | 7 +++++-- drivers/char/hw_random/pasemi-rng.c | 7 +++++-- drivers/char/ipmi/ipmi_si_intf.c | 7 +++++-- drivers/char/xilinx_hwicap/xilinx_hwicap.c | 5 ++--- 4 files changed, 17 insertions(+), 9 deletions(-)
drivers/char/hw_random/n2-drv.c +5 -2
@@ -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), };
drivers/char/hw_random/pasemi-rng.c +5 -2
@@ -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, };
drivers/char/ipmi/ipmi_si_intf.c +5 -2
@@ -2492,8 +2492,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), };
drivers/char/xilinx_hwicap/xilinx_hwicap.c +2 -3
@@ -811,13 +811,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, }, };
PATCH 7/27 drivers/char/of: don't use deprecated field in of_platform_driver
In reply to Grant Likely.name, .match_table and .owner are duplicated in both of_platform_driver and device_driver, so the of_platform_driver copies will be removed soon.
---
drivers/char/hw_random/n2-drv.c | 7 +++++-- drivers/char/hw_random/pasemi-rng.c | 7 +++++-- drivers/char/ipmi/ipmi_si_intf.c | 7 +++++-- drivers/char/xilinx_hwicap/xilinx_hwicap.c | 5 ++--- 4 files changed, 17 insertions(+), 9 deletions(-)
drivers/char/hw_random/n2-drv.c +5 -2
@@ -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), };
drivers/char/hw_random/pasemi-rng.c +5 -2
@@ -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, };
drivers/char/ipmi/ipmi_si_intf.c +5 -2
@@ -2492,8 +2492,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), };
drivers/char/xilinx_hwicap/xilinx_hwicap.c +2 -3
@@ -811,13 +811,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, }, };
PATCH 7/27 drivers/char/of: don't use deprecated field in of_platform_driver
In reply to Grant Likely.name, .match_table and .owner are duplicated in both of_platform_driver and device_driver, so the of_platform_driver copies will be removed soon.
---
drivers/char/hw_random/n2-drv.c | 7 +++++-- drivers/char/hw_random/pasemi-rng.c | 7 +++++-- drivers/char/ipmi/ipmi_si_intf.c | 7 +++++-- drivers/char/xilinx_hwicap/xilinx_hwicap.c | 5 ++--- 4 files changed, 17 insertions(+), 9 deletions(-)
drivers/char/hw_random/n2-drv.c +5 -2
@@ -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), };
drivers/char/hw_random/pasemi-rng.c +5 -2
@@ -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, };
drivers/char/ipmi/ipmi_si_intf.c +5 -2
@@ -2492,8 +2492,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), };
drivers/char/xilinx_hwicap/xilinx_hwicap.c +2 -3
@@ -811,13 +811,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, }, };
PATCH 11/27 drivers/macintosh/of: don't use deprecated field in of_platform_driver
In reply to Grant Likely.name, .match_table and .owner are duplicated in both of_platform_driver and device_driver, so the of_platform_driver copies will be removed soon.
---
drivers/macintosh/smu.c | 7 +++++-- drivers/macintosh/therm_pm72.c | 7 +++++-- drivers/macintosh/therm_windtunnel.c | 7 +++++-- 3 files changed, 15 insertions(+), 6 deletions(-)
drivers/macintosh/smu.c +5 -2
@@ -670,8 +670,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, };
drivers/macintosh/therm_pm72.c +5 -2
@@ -2221,8 +2221,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 };
drivers/macintosh/therm_windtunnel.c +5 -2
@@ -464,8 +464,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, };
PATCH 7/27 drivers/char/of: don't use deprecated field in of_platform_driver
In reply to Grant Likely.name, .match_table and .owner are duplicated in both of_platform_driver and device_driver, so the of_platform_driver copies will be removed soon.
---
drivers/char/hw_random/n2-drv.c | 7 +++++-- drivers/char/hw_random/pasemi-rng.c | 7 +++++-- drivers/char/ipmi/ipmi_si_intf.c | 7 +++++-- drivers/char/xilinx_hwicap/xilinx_hwicap.c | 5 ++--- 4 files changed, 17 insertions(+), 9 deletions(-)
drivers/char/hw_random/n2-drv.c +5 -2
@@ -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), };
drivers/char/hw_random/pasemi-rng.c +5 -2
@@ -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, };
drivers/char/ipmi/ipmi_si_intf.c +5 -2
@@ -2492,8 +2492,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), };
drivers/char/xilinx_hwicap/xilinx_hwicap.c +2 -3
@@ -811,13 +811,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, }, };
PATCH 7/27 drivers/char/of: don't use deprecated field in of_platform_driver
In reply to Grant Likely.name, .match_table and .owner are duplicated in both of_platform_driver and device_driver, so the of_platform_driver copies will be removed soon.
---
drivers/char/hw_random/n2-drv.c | 7 +++++-- drivers/char/hw_random/pasemi-rng.c | 7 +++++-- drivers/char/ipmi/ipmi_si_intf.c | 7 +++++-- drivers/char/xilinx_hwicap/xilinx_hwicap.c | 5 ++--- 4 files changed, 17 insertions(+), 9 deletions(-)
drivers/char/hw_random/n2-drv.c +5 -2
@@ -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), };
drivers/char/hw_random/pasemi-rng.c +5 -2
@@ -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, };
drivers/char/ipmi/ipmi_si_intf.c +5 -2
@@ -2492,8 +2492,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), };
drivers/char/xilinx_hwicap/xilinx_hwicap.c +2 -3
@@ -811,13 +811,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, }, };
PATCH 8/27 drivers/crypto/of: don't use deprecated field in of_platform_driver
In reply to Grant Likely.name, .match_table and .owner are duplicated in both of_platform_driver and device_driver, so the of_platform_driver copies will be removed soon.
---
drivers/crypto/amcc/crypto4xx_core.c | 7 +++++-- drivers/crypto/talitos.c | 7 +++++-- 2 files changed, 10 insertions(+), 4 deletions(-)
drivers/crypto/amcc/crypto4xx_core.c +5 -2
@@ -1280,8 +1280,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, };
drivers/crypto/talitos.c +5 -2
@@ -1967,8 +1967,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, };
PATCH 8/27 drivers/crypto/of: don't use deprecated field in of_platform_driver
In reply to Grant Likely.name, .match_table and .owner are duplicated in both of_platform_driver and device_driver, so the of_platform_driver copies will be removed soon.
---
drivers/crypto/amcc/crypto4xx_core.c | 7 +++++-- drivers/crypto/talitos.c | 7 +++++-- 2 files changed, 10 insertions(+), 4 deletions(-)
drivers/crypto/amcc/crypto4xx_core.c +5 -2
@@ -1280,8 +1280,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, };
drivers/crypto/talitos.c +5 -2
@@ -1967,8 +1967,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, };
PATCH 12/27 drivers/mtd/of: don't use deprecated field in of_platform_driver
In reply to Grant Likely.name, .match_table and .owner are duplicated in both of_platform_driver and device_driver, so the of_platform_driver copies will be removed soon.
---
drivers/mtd/maps/physmap_of.c | 7 +++++-- drivers/mtd/maps/sun_uflash.c | 7 +++++-- drivers/mtd/nand/fsl_elbc_nand.c | 5 +++-- drivers/mtd/nand/fsl_upm.c | 7 +++++-- drivers/mtd/nand/ndfc.c | 5 +++-- drivers/mtd/nand/pasemi_nand.c | 7 +++++-- drivers/mtd/nand/socrates_nand.c | 7 +++++-- 7 files changed, 31 insertions(+), 14 deletions(-)
drivers/mtd/maps/physmap_of.c +5 -2
@@ -374,8 +374,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, };
drivers/mtd/maps/sun_uflash.c +5 -2
@@ -148,8 +148,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), };
drivers/mtd/nand/fsl_elbc_nand.c +3 -2
@@ -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, };
drivers/mtd/nand/fsl_upm.c +5 -2
@@ -356,8 +356,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), };
drivers/mtd/nand/ndfc.c +3 -2
@@ -293,9 +293,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), };
drivers/mtd/nand/pasemi_nand.c +5 -2
@@ -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, };
drivers/mtd/nand/socrates_nand.c +5 -2
@@ -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), };
PATCH 8/27 drivers/crypto/of: don't use deprecated field in of_platform_driver
In reply to Grant Likely.name, .match_table and .owner are duplicated in both of_platform_driver and device_driver, so the of_platform_driver copies will be removed soon.
---
drivers/crypto/amcc/crypto4xx_core.c | 7 +++++-- drivers/crypto/talitos.c | 7 +++++-- 2 files changed, 10 insertions(+), 4 deletions(-)
drivers/crypto/amcc/crypto4xx_core.c +5 -2
@@ -1280,8 +1280,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, };
drivers/crypto/talitos.c +5 -2
@@ -1967,8 +1967,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, };
PATCH 13/27 drivers/net/of: don't use deprecated field in of_platform_driver
In reply to Grant Likely.name, .match_table and .owner are duplicated in both of_platform_driver and device_driver, so the of_platform_driver copies will be removed soon.
---
drivers/net/can/mscan/mpc5xxx_can.c | 8 +++++--- drivers/net/can/sja1000/sja1000_of_platform.c | 8 +++++--- drivers/net/ehea/ehea_main.c | 7 +++++-- drivers/net/fs_enet/fs_enet-main.c | 7 +++++-- drivers/net/fs_enet/mii-bitbang.c | 7 +++++-- drivers/net/fs_enet/mii-fec.c | 7 +++++-- drivers/net/fsl_pq_mdio.c | 7 +++++-- drivers/net/gianfar.c | 10 ++++++---- drivers/net/ibm_newemac/core.c | 8 +++++--- drivers/net/ibm_newemac/mal.c | 8 +++++--- drivers/net/ibm_newemac/rgmii.c | 8 +++++--- drivers/net/ibm_newemac/tah.c | 8 +++++--- drivers/net/ibm_newemac/zmii.c | 8 +++++--- drivers/net/ll_temac_main.c | 2 +- drivers/net/myri_sbus.c | 7 +++++-- drivers/net/niu.c | 7 +++++-- drivers/net/phy/mdio-gpio.c | 7 +++++-- drivers/net/sunbmac.c | 7 +++++-- drivers/net/sunhme.c | 7 +++++-- drivers/net/sunlance.c | 7 +++++-- drivers/net/sunqe.c | 7 +++++-- drivers/net/ucc_geth.c | 7 +++++-- drivers/net/xilinx_emaclite.c | 7 +++++-- 23 files changed, 112 insertions(+), 54 deletions(-)
drivers/net/can/mscan/mpc5xxx_can.c +5 -3
@@ -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 )
drivers/net/can/sja1000/sja1000_of_platform.c +5 -3
@@ -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 )
drivers/net/ehea/ehea_main.c +5 -2
@@ -121,8 +121,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 = { + .owner =THIS_MODULE , + .name ="ehea" , + .of_match_table = ehea_device_table, + }, .probe = ehea_probe_adapter, .remove = ehea_remove, };
drivers/net/fs_enet/fs_enet-main.c +5 -2
@@ -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, };
drivers/net/fs_enet/mii-bitbang.c +5 -2
@@ -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 = { + .owner =THIS_MODULE , + .name ="fsl-bb-mdio" , + .of_match_table = fs_enet_mdio_bb_match, + }, .probe = fs_enet_mdio_probe, .remove = fs_enet_mdio_remove, };
drivers/net/fs_enet/mii-fec.c +5 -2
@@ -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, };
drivers/net/fsl_pq_mdio.c +5 -2
@@ -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 )
drivers/net/gianfar.c +6 -4
@@ -3050,14 +3050,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 )
drivers/net/ibm_newemac/core.c +5 -3
@@ -2995,9 +2995,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, };
drivers/net/ibm_newemac/mal.c +5 -3
@@ -789,9 +789,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, };
drivers/net/ibm_newemac/rgmii.c +5 -3
@@ -318,9 +318,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, };
drivers/net/ibm_newemac/tah.c +5 -3
@@ -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, };
drivers/net/ibm_newemac/zmii.c +5 -3
@@ -312,9 +312,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, };
drivers/net/ll_temac_main.c +1 -1
@@ -954,12 +954,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, }, };
drivers/net/myri_sbus.c +5 -2
@@ -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), };
drivers/net/niu.c +5 -2
@@ -10206,8 +10206,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), };
drivers/net/phy/mdio-gpio.c +5 -2
@@ -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), };
drivers/net/sunbmac.c +5 -2
@@ -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), };
drivers/net/sunhme.c +5 -2
@@ -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), };
drivers/net/sunlance.c +5 -2
@@ -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), };
drivers/net/sunqe.c +5 -2
@@ -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), };
drivers/net/ucc_geth.c +5 -2
@@ -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,
drivers/net/xilinx_emaclite.c +5 -2
@@ -1292,8 +1292,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), };
PATCH 8/27 drivers/crypto/of: don't use deprecated field in of_platform_driver
In reply to Grant Likely.name, .match_table and .owner are duplicated in both of_platform_driver and device_driver, so the of_platform_driver copies will be removed soon.
---
drivers/crypto/amcc/crypto4xx_core.c | 7 +++++-- drivers/crypto/talitos.c | 7 +++++-- 2 files changed, 10 insertions(+), 4 deletions(-)
drivers/crypto/amcc/crypto4xx_core.c +5 -2
@@ -1280,8 +1280,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, };
drivers/crypto/talitos.c +5 -2
@@ -1967,8 +1967,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, };
PATCH 14/27 drivers/serial/of: don't use deprecated field in of_platform_driver
In reply to Grant Likely.name, .match_table and .owner are duplicated in both of_platform_driver and device_driver, so the of_platform_driver copies will be removed soon.
---
drivers/serial/apbuart.c | 8 ++++---- drivers/serial/cpm_uart/cpm_uart_core.c | 7 +++++-- drivers/serial/mpc52xx_uart.c | 7 ++++--- drivers/serial/of_serial.c | 8 +++++--- drivers/serial/sunhv.c | 7 +++++-- drivers/serial/sunsab.c | 7 +++++-- drivers/serial/sunsu.c | 7 +++++-- drivers/serial/sunzilog.c | 7 +++++-- drivers/serial/uartlite.c | 5 ++--- drivers/serial/ucc_uart.c | 8 +++++--- 10 files changed, 45 insertions(+), 26 deletions(-)
drivers/serial/apbuart.c +4 -4
@@ -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, + }, };
drivers/serial/cpm_uart/cpm_uart_core.c +5 -2
@@ -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, };
drivers/serial/mpc52xx_uart.c +4 -3
@@ -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, }, };
drivers/serial/of_serial.c +5 -3
@@ -174,11 +174,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 )
drivers/serial/sunhv.c +5 -2
@@ -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), };
drivers/serial/sunsab.c +5 -2
@@ -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), };
drivers/serial/sunsu.c +5 -2
@@ -1536,8 +1536,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), };
drivers/serial/sunzilog.c +5 -2
@@ -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), };
drivers/serial/uartlite.c +2 -3
@@ -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, }, };
drivers/serial/ucc_uart.c +5 -3
@@ -1485,9 +1485,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, };
PATCH 9/27 drivers/atm/of: don't use deprecated field in of_platform_driver
In reply to Grant Likely.name, .match_table and .owner are duplicated in both of_platform_driver and device_driver, so the of_platform_driver copies will be removed soon.
---
drivers/atm/fore200e.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-)
drivers/atm/fore200e.c +5 -2
@@ -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), };
PATCH 15/27 drivers/spi/of: don't use deprecated field in of_platform_driver
In reply to Grant Likely.name, .match_table and .owner are duplicated in both of_platform_driver and device_driver, so the of_platform_driver copies will be removed soon.
---
drivers/spi/mpc52xx_psc_spi.c | 4 +--- drivers/spi/mpc52xx_spi.c | 8 +++++--- drivers/spi/spi_mpc8xxx.c | 7 +++++-- drivers/spi/spi_ppc4xx.c | 2 +- drivers/spi/xilinx_spi_of.c | 2 +- 5 files changed, 13 insertions(+), 10 deletions(-)
drivers/spi/mpc52xx_psc_spi.c +1 -3
@@ -513,14 +513,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, }, };
drivers/spi/mpc52xx_spi.c +5 -3
@@ -557,9 +557,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), };
drivers/spi/spi_mpc8xxx.c +5 -2
@@ -1311,8 +1311,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), };
drivers/spi/spi_ppc4xx.c +1 -1
@@ -586,12 +586,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, }, };
drivers/spi/xilinx_spi_of.c +1 -1
@@ -108,12 +108,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, }, };
PATCH 9/27 drivers/atm/of: don't use deprecated field in of_platform_driver
In reply to Grant Likely.name, .match_table and .owner are duplicated in both of_platform_driver and device_driver, so the of_platform_driver copies will be removed soon.
---
drivers/atm/fore200e.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-)
drivers/atm/fore200e.c +5 -2
@@ -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), };
PATCH 9/27 drivers/atm/of: don't use deprecated field in of_platform_driver
In reply to Grant Likely.name, .match_table and .owner are duplicated in both of_platform_driver and device_driver, so the of_platform_driver copies will be removed soon.
---
drivers/atm/fore200e.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-)
drivers/atm/fore200e.c +5 -2
@@ -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), };
PATCH 9/27 drivers/atm/of: don't use deprecated field in of_platform_driver
In reply to Grant Likely.name, .match_table and .owner are duplicated in both of_platform_driver and device_driver, so the of_platform_driver copies will be removed soon.
---
drivers/atm/fore200e.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-)
drivers/atm/fore200e.c +5 -2
@@ -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), };
PATCH 10/27 drivers/input/of: don't use deprecated field in of_platform_driver
In reply to Grant Likely.name, .match_table and .owner are duplicated in both of_platform_driver and device_driver, so the of_platform_driver copies will be removed soon.
---
drivers/input/misc/sparcspkr.c | 14 ++++++++++---- drivers/input/serio/i8042-sparcio.h | 7 +++++-- drivers/input/serio/xilinx_ps2.c | 7 +++++-- 3 files changed, 20 insertions(+), 8 deletions(-)
drivers/input/misc/sparcspkr.c +10 -4
@@ -258,8 +258,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,
@@ -337,8 +340,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,
drivers/input/serio/i8042-sparcio.h +5 -2
@@ -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), };
drivers/input/serio/xilinx_ps2.c +5 -2
@@ -361,8 +361,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), };
PATCH 10/27 drivers/input/of: don't use deprecated field in of_platform_driver
In reply to Grant Likely.name, .match_table and .owner are duplicated in both of_platform_driver and device_driver, so the of_platform_driver copies will be removed soon.
---
drivers/input/misc/sparcspkr.c | 14 ++++++++++---- drivers/input/serio/i8042-sparcio.h | 7 +++++-- drivers/input/serio/xilinx_ps2.c | 7 +++++-- 3 files changed, 20 insertions(+), 8 deletions(-)
drivers/input/misc/sparcspkr.c +10 -4
@@ -258,8 +258,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,
@@ -337,8 +340,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,
drivers/input/serio/i8042-sparcio.h +5 -2
@@ -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), };
drivers/input/serio/xilinx_ps2.c +5 -2
@@ -361,8 +361,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), };
PATCH 10/27 drivers/input/of: don't use deprecated field in of_platform_driver
In reply to Grant Likely.name, .match_table and .owner are duplicated in both of_platform_driver and device_driver, so the of_platform_driver copies will be removed soon.
---
drivers/input/misc/sparcspkr.c | 14 ++++++++++---- drivers/input/serio/i8042-sparcio.h | 7 +++++-- drivers/input/serio/xilinx_ps2.c | 7 +++++-- 3 files changed, 20 insertions(+), 8 deletions(-)
drivers/input/misc/sparcspkr.c +10 -4
@@ -258,8 +258,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,
@@ -337,8 +340,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,
drivers/input/serio/i8042-sparcio.h +5 -2
@@ -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), };
drivers/input/serio/xilinx_ps2.c +5 -2
@@ -361,8 +361,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), };
PATCH 10/27 drivers/input/of: don't use deprecated field in of_platform_driver
In reply to Grant Likely.name, .match_table and .owner are duplicated in both of_platform_driver and device_driver, so the of_platform_driver copies will be removed soon.
---
drivers/input/misc/sparcspkr.c | 14 ++++++++++---- drivers/input/serio/i8042-sparcio.h | 7 +++++-- drivers/input/serio/xilinx_ps2.c | 7 +++++-- 3 files changed, 20 insertions(+), 8 deletions(-)
drivers/input/misc/sparcspkr.c +10 -4
@@ -258,8 +258,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,
@@ -337,8 +340,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,
drivers/input/serio/i8042-sparcio.h +5 -2
@@ -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), };
drivers/input/serio/xilinx_ps2.c +5 -2
@@ -361,8 +361,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), };
PATCH 11/27 drivers/macintosh/of: don't use deprecated field in of_platform_driver
In reply to Grant Likely.name, .match_table and .owner are duplicated in both of_platform_driver and device_driver, so the of_platform_driver copies will be removed soon.
---
drivers/macintosh/smu.c | 7 +++++-- drivers/macintosh/therm_pm72.c | 7 +++++-- drivers/macintosh/therm_windtunnel.c | 7 +++++-- 3 files changed, 15 insertions(+), 6 deletions(-)
drivers/macintosh/smu.c +5 -2
@@ -670,8 +670,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, };
drivers/macintosh/therm_pm72.c +5 -2
@@ -2221,8 +2221,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 };
drivers/macintosh/therm_windtunnel.c +5 -2
@@ -464,8 +464,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, };
PATCH 11/27 drivers/macintosh/of: don't use deprecated field in of_platform_driver
In reply to Grant Likely.name, .match_table and .owner are duplicated in both of_platform_driver and device_driver, so the of_platform_driver copies will be removed soon.
---
drivers/macintosh/smu.c | 7 +++++-- drivers/macintosh/therm_pm72.c | 7 +++++-- drivers/macintosh/therm_windtunnel.c | 7 +++++-- 3 files changed, 15 insertions(+), 6 deletions(-)
drivers/macintosh/smu.c +5 -2
@@ -670,8 +670,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, };
drivers/macintosh/therm_pm72.c +5 -2
@@ -2221,8 +2221,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 };
drivers/macintosh/therm_windtunnel.c +5 -2
@@ -464,8 +464,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, };
PATCH 11/27 drivers/macintosh/of: don't use deprecated field in of_platform_driver
In reply to Grant Likely.name, .match_table and .owner are duplicated in both of_platform_driver and device_driver, so the of_platform_driver copies will be removed soon.
---
drivers/macintosh/smu.c | 7 +++++-- drivers/macintosh/therm_pm72.c | 7 +++++-- drivers/macintosh/therm_windtunnel.c | 7 +++++-- 3 files changed, 15 insertions(+), 6 deletions(-)
drivers/macintosh/smu.c +5 -2
@@ -670,8 +670,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, };
drivers/macintosh/therm_pm72.c +5 -2
@@ -2221,8 +2221,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 };
drivers/macintosh/therm_windtunnel.c +5 -2
@@ -464,8 +464,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, };
PATCH 16/27 drivers/scsi/of: don't use deprecated field in of_platform_driver
In reply to Grant Likely.name, .match_table and .owner are duplicated in both of_platform_driver and device_driver, so the of_platform_driver copies will be removed soon.
---
drivers/scsi/qlogicpti.c | 7 +++++-- drivers/scsi/sun_esp.c | 7 +++++-- 2 files changed, 10 insertions(+), 4 deletions(-)
drivers/scsi/qlogicpti.c +5 -2
@@ -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), };
drivers/scsi/sun_esp.c +5 -2
@@ -632,8 +632,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), };
PATCH 11/27 drivers/macintosh/of: don't use deprecated field in of_platform_driver
In reply to Grant Likely.name, .match_table and .owner are duplicated in both of_platform_driver and device_driver, so the of_platform_driver copies will be removed soon.
---
drivers/macintosh/smu.c | 7 +++++-- drivers/macintosh/therm_pm72.c | 7 +++++-- drivers/macintosh/therm_windtunnel.c | 7 +++++-- 3 files changed, 15 insertions(+), 6 deletions(-)
drivers/macintosh/smu.c +5 -2
@@ -670,8 +670,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, };
drivers/macintosh/therm_pm72.c +5 -2
@@ -2221,8 +2221,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 };
drivers/macintosh/therm_windtunnel.c +5 -2
@@ -464,8 +464,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, };
PATCH 12/27 drivers/mtd/of: don't use deprecated field in of_platform_driver
In reply to Grant Likely.name, .match_table and .owner are duplicated in both of_platform_driver and device_driver, so the of_platform_driver copies will be removed soon.
---
drivers/mtd/maps/physmap_of.c | 7 +++++-- drivers/mtd/maps/sun_uflash.c | 7 +++++-- drivers/mtd/nand/fsl_elbc_nand.c | 5 +++-- drivers/mtd/nand/fsl_upm.c | 7 +++++-- drivers/mtd/nand/ndfc.c | 5 +++-- drivers/mtd/nand/pasemi_nand.c | 7 +++++-- drivers/mtd/nand/socrates_nand.c | 7 +++++-- 7 files changed, 31 insertions(+), 14 deletions(-)
drivers/mtd/maps/physmap_of.c +5 -2
@@ -374,8 +374,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, };
drivers/mtd/maps/sun_uflash.c +5 -2
@@ -148,8 +148,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), };
drivers/mtd/nand/fsl_elbc_nand.c +3 -2
@@ -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, };
drivers/mtd/nand/fsl_upm.c +5 -2
@@ -356,8 +356,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), };
drivers/mtd/nand/ndfc.c +3 -2
@@ -293,9 +293,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), };
drivers/mtd/nand/pasemi_nand.c +5 -2
@@ -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, };
drivers/mtd/nand/socrates_nand.c +5 -2
@@ -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), };
Re: [PATCH 12/27] drivers/mtd/of: don't use deprecated field in of_platform_driver
Quoted 5 lines · On Thu, 11 Mar 2010 11:22:54 -0700 Grant Likely <[email protected]>…
.name, .match_table and .owner are duplicated in both
of_platform_driveranddevice_driver, so theof_platform_drivercopies will be removed soon.Signed-off-by Grant Likely <[email protected]>
NDFC
PATCH 12/27 drivers/mtd/of: don't use deprecated field in of_platform_driver
In reply to Grant Likely.name, .match_table and .owner are duplicated in both of_platform_driver and device_driver, so the of_platform_driver copies will be removed soon.
---
drivers/mtd/maps/physmap_of.c | 7 +++++-- drivers/mtd/maps/sun_uflash.c | 7 +++++-- drivers/mtd/nand/fsl_elbc_nand.c | 5 +++-- drivers/mtd/nand/fsl_upm.c | 7 +++++-- drivers/mtd/nand/ndfc.c | 5 +++-- drivers/mtd/nand/pasemi_nand.c | 7 +++++-- drivers/mtd/nand/socrates_nand.c | 7 +++++-- 7 files changed, 31 insertions(+), 14 deletions(-)
drivers/mtd/maps/physmap_of.c +5 -2
@@ -374,8 +374,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, };
drivers/mtd/maps/sun_uflash.c +5 -2
@@ -148,8 +148,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), };
drivers/mtd/nand/fsl_elbc_nand.c +3 -2
@@ -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, };
drivers/mtd/nand/fsl_upm.c +5 -2
@@ -356,8 +356,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), };
drivers/mtd/nand/ndfc.c +3 -2
@@ -293,9 +293,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), };
drivers/mtd/nand/pasemi_nand.c +5 -2
@@ -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, };
drivers/mtd/nand/socrates_nand.c +5 -2
@@ -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), };
PATCH 12/27 drivers/mtd/of: don't use deprecated field in of_platform_driver
In reply to Grant Likely.name, .match_table and .owner are duplicated in both of_platform_driver and device_driver, so the of_platform_driver copies will be removed soon.
---
drivers/mtd/maps/physmap_of.c | 7 +++++-- drivers/mtd/maps/sun_uflash.c | 7 +++++-- drivers/mtd/nand/fsl_elbc_nand.c | 5 +++-- drivers/mtd/nand/fsl_upm.c | 7 +++++-- drivers/mtd/nand/ndfc.c | 5 +++-- drivers/mtd/nand/pasemi_nand.c | 7 +++++-- drivers/mtd/nand/socrates_nand.c | 7 +++++-- 7 files changed, 31 insertions(+), 14 deletions(-)
drivers/mtd/maps/physmap_of.c +5 -2
@@ -374,8 +374,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, };
drivers/mtd/maps/sun_uflash.c +5 -2
@@ -148,8 +148,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), };
drivers/mtd/nand/fsl_elbc_nand.c +3 -2
@@ -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, };
drivers/mtd/nand/fsl_upm.c +5 -2
@@ -356,8 +356,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), };
drivers/mtd/nand/ndfc.c +3 -2
@@ -293,9 +293,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), };
drivers/mtd/nand/pasemi_nand.c +5 -2
@@ -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, };
drivers/mtd/nand/socrates_nand.c +5 -2
@@ -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), };
PATCH 17/27 drivers/sbus/of: don't use deprecated field in of_platform_driver
In reply to Grant Likely.name, .match_table and .owner are duplicated in both of_platform_driver and device_driver, so the of_platform_driver copies will be removed soon.
---
drivers/sbus/char/bbc_i2c.c | 7 +++++-- drivers/sbus/char/display7seg.c | 7 +++++-- drivers/sbus/char/envctrl.c | 7 +++++-- drivers/sbus/char/flash.c | 7 +++++-- drivers/sbus/char/uctrl.c | 7 +++++-- 5 files changed, 25 insertions(+), 10 deletions(-)
drivers/sbus/char/bbc_i2c.c +5 -2
@@ -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), };
drivers/sbus/char/display7seg.c +5 -2
@@ -265,8 +265,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), };
drivers/sbus/char/envctrl.c +5 -2
@@ -1130,8 +1130,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), };
drivers/sbus/char/flash.c +5 -2
@@ -208,8 +208,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), };
drivers/sbus/char/uctrl.c +5 -2
@@ -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), };
PATCH 12/27 drivers/mtd/of: don't use deprecated field in of_platform_driver
In reply to Grant Likely.name, .match_table and .owner are duplicated in both of_platform_driver and device_driver, so the of_platform_driver copies will be removed soon.
---
drivers/mtd/maps/physmap_of.c | 7 +++++-- drivers/mtd/maps/sun_uflash.c | 7 +++++-- drivers/mtd/nand/fsl_elbc_nand.c | 5 +++-- drivers/mtd/nand/fsl_upm.c | 7 +++++-- drivers/mtd/nand/ndfc.c | 5 +++-- drivers/mtd/nand/pasemi_nand.c | 7 +++++-- drivers/mtd/nand/socrates_nand.c | 7 +++++-- 7 files changed, 31 insertions(+), 14 deletions(-)
drivers/mtd/maps/physmap_of.c +5 -2
@@ -374,8 +374,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, };
drivers/mtd/maps/sun_uflash.c +5 -2
@@ -148,8 +148,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), };
drivers/mtd/nand/fsl_elbc_nand.c +3 -2
@@ -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, };
drivers/mtd/nand/fsl_upm.c +5 -2
@@ -356,8 +356,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), };
drivers/mtd/nand/ndfc.c +3 -2
@@ -293,9 +293,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), };
drivers/mtd/nand/pasemi_nand.c +5 -2
@@ -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, };
drivers/mtd/nand/socrates_nand.c +5 -2
@@ -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), };
PATCH 13/27 drivers/net/of: don't use deprecated field in of_platform_driver
In reply to Grant Likely.name, .match_table and .owner are duplicated in both of_platform_driver and device_driver, so the of_platform_driver copies will be removed soon.
---
drivers/net/can/mscan/mpc5xxx_can.c | 8 +++++--- drivers/net/can/sja1000/sja1000_of_platform.c | 8 +++++--- drivers/net/ehea/ehea_main.c | 7 +++++-- drivers/net/fs_enet/fs_enet-main.c | 7 +++++-- drivers/net/fs_enet/mii-bitbang.c | 7 +++++-- drivers/net/fs_enet/mii-fec.c | 7 +++++-- drivers/net/fsl_pq_mdio.c | 7 +++++-- drivers/net/gianfar.c | 10 ++++++---- drivers/net/ibm_newemac/core.c | 8 +++++--- drivers/net/ibm_newemac/mal.c | 8 +++++--- drivers/net/ibm_newemac/rgmii.c | 8 +++++--- drivers/net/ibm_newemac/tah.c | 8 +++++--- drivers/net/ibm_newemac/zmii.c | 8 +++++--- drivers/net/ll_temac_main.c | 2 +- drivers/net/myri_sbus.c | 7 +++++-- drivers/net/niu.c | 7 +++++-- drivers/net/phy/mdio-gpio.c | 7 +++++-- drivers/net/sunbmac.c | 7 +++++-- drivers/net/sunhme.c | 7 +++++-- drivers/net/sunlance.c | 7 +++++-- drivers/net/sunqe.c | 7 +++++-- drivers/net/ucc_geth.c | 7 +++++-- drivers/net/xilinx_emaclite.c | 7 +++++-- 23 files changed, 112 insertions(+), 54 deletions(-)
drivers/net/can/mscan/mpc5xxx_can.c +5 -3
@@ -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 )
drivers/net/can/sja1000/sja1000_of_platform.c +5 -3
@@ -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 )
drivers/net/ehea/ehea_main.c +5 -2
@@ -121,8 +121,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 = { + .owner =THIS_MODULE , + .name ="ehea" , + .of_match_table = ehea_device_table, + }, .probe = ehea_probe_adapter, .remove = ehea_remove, };
drivers/net/fs_enet/fs_enet-main.c +5 -2
@@ -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, };
drivers/net/fs_enet/mii-bitbang.c +5 -2
@@ -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 = { + .owner =THIS_MODULE , + .name ="fsl-bb-mdio" , + .of_match_table = fs_enet_mdio_bb_match, + }, .probe = fs_enet_mdio_probe, .remove = fs_enet_mdio_remove, };
drivers/net/fs_enet/mii-fec.c +5 -2
@@ -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, };
drivers/net/fsl_pq_mdio.c +5 -2
@@ -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 )
drivers/net/gianfar.c +6 -4
@@ -3050,14 +3050,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 )
drivers/net/ibm_newemac/core.c +5 -3
@@ -2995,9 +2995,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, };
drivers/net/ibm_newemac/mal.c +5 -3
@@ -789,9 +789,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, };
drivers/net/ibm_newemac/rgmii.c +5 -3
@@ -318,9 +318,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, };
drivers/net/ibm_newemac/tah.c +5 -3
@@ -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, };
drivers/net/ibm_newemac/zmii.c +5 -3
@@ -312,9 +312,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, };
drivers/net/ll_temac_main.c +1 -1
@@ -954,12 +954,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, }, };
drivers/net/myri_sbus.c +5 -2
@@ -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), };
drivers/net/niu.c +5 -2
@@ -10206,8 +10206,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), };
drivers/net/phy/mdio-gpio.c +5 -2
@@ -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), };
drivers/net/sunbmac.c +5 -2
@@ -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), };
drivers/net/sunhme.c +5 -2
@@ -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), };
drivers/net/sunlance.c +5 -2
@@ -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), };
drivers/net/sunqe.c +5 -2
@@ -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), };
drivers/net/ucc_geth.c +5 -2
@@ -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,
drivers/net/xilinx_emaclite.c +5 -2
@@ -1292,8 +1292,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), };
Re: [alsa-devel] [PATCH 13/27] drivers/net/of: don't use deprecated field in of_platform_driver
I'm seeing this error with this patch applied, when building for an mpc8641_hpcn
CC drivers/net/gianfar.odrivers/net/gianfar.c: In function 'gfar_of_init':drivers/net/gianfar.c:606: error: 'struct platform_device' has no member named 'node'drivers/net/gianfar.c:644: error: 'struct platform_device' has no member named 'node'drivers/net/gianfar.c: In function 'gfar_probe':drivers/net/gianfar.c:891: error: 'struct platform_device' has no member named 'node'
make[2]: *** [drivers/net/gianfar.o] Error 1
make[1]: *** [drivers/net] Error 2
make: *** [drivers] Error 2
Quoted 30 lines · Grant Likely
.name, .match_table and .owner are duplicated in both
of_platform_driveranddevice_driver, so theof_platform_drivercopies will be removed soon.Signed-off-by Grant Likely <[email protected]>---
drivers/net/can/mscan/mpc5xxx_can.c | 8 +++++---
drivers/net/can/sja1000/sja1000_of_platform.c| 8 +++++---drivers/net/ehea/ehea_main.c| 7 +++++--drivers/net/fs_enet/fs_enet-main.c| 7 +++++--drivers/net/fs_enet/mii-bitbang.c| 7 +++++--drivers/net/fs_enet/mii-fec.c| 7 +++++--drivers/net/fsl_pq_mdio.c| 7 +++++--drivers/net/gianfar.c| 10 ++++++----drivers/net/ibm_newemac/core.c| 8 +++++---drivers/net/ibm_newemac/mal.c| 8 +++++---drivers/net/ibm_newemac/rgmii.c| 8 +++++---drivers/net/ibm_newemac/tah.c| 8 +++++---drivers/net/ibm_newemac/zmii.c| 8 +++++---drivers/net/ll_temac_main.c| 2 +-drivers/net/myri_sbus.c| 7 +++++--drivers/net/niu.c| 7 +++++--drivers/net/phy/mdio-gpio.c| 7 +++++--drivers/net/sunbmac.c| 7 +++++--drivers/net/sunhme.c| 7 +++++--drivers/net/sunlance.c| 7 +++++--drivers/net/sunqe.c| 7 +++++--drivers/net/ucc_geth.c| 7 +++++--drivers/net/xilinx_emaclite.c| 7 +++++--23 files changed, 112 insertions(+), 54 deletions(-)
Signature · 2 lines
Timur Tabi Linux kernel developer at Freescale
A message that is not in the archive (sent off-list or not yet received): ed82fe3e1003260823q5a2ba774ifd3465b41b8f0a10-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org
Re: [alsa-devel] [PATCH 13/27] drivers/net/of: don't use deprecated field in of_platform_driver
Quoted 14 lines · Timur Tabi
I'm seeing this error with this patch applied, when building for an
mpc8641_hpcnCC drivers/net/gianfar.o
drivers/net/gianfar.c: In function 'gfar_of_init':drivers/net/gianfar.c:606: error: 'structplatform_device' has no member named 'node'drivers/net/gianfar.c:644: error: 'structplatform_device' has no member named 'node'drivers/net/gianfar.c: In function 'gfar_probe':drivers/net/gianfar.c:891: error: 'structplatform_device' has no member named 'node'
make[2]: *** [drivers/net/gianfar.o] Error 1
make[1]: *** [drivers/net] Error 2
make: *** [drivers] Error 2
Thanks for the testing Timur. I missed converting that driver. I believe I've got that fixed now and I'll be pushing out a new tree real-soon-now.
g.
PATCH 13/27 drivers/net/of: don't use deprecated field in of_platform_driver
In reply to Grant Likely.name, .match_table and .owner are duplicated in both of_platform_driver and device_driver, so the of_platform_driver copies will be removed soon.
---
drivers/net/can/mscan/mpc5xxx_can.c | 8 +++++--- drivers/net/can/sja1000/sja1000_of_platform.c | 8 +++++--- drivers/net/ehea/ehea_main.c | 7 +++++-- drivers/net/fs_enet/fs_enet-main.c | 7 +++++-- drivers/net/fs_enet/mii-bitbang.c | 7 +++++-- drivers/net/fs_enet/mii-fec.c | 7 +++++-- drivers/net/fsl_pq_mdio.c | 7 +++++-- drivers/net/gianfar.c | 10 ++++++---- drivers/net/ibm_newemac/core.c | 8 +++++--- drivers/net/ibm_newemac/mal.c | 8 +++++--- drivers/net/ibm_newemac/rgmii.c | 8 +++++--- drivers/net/ibm_newemac/tah.c | 8 +++++--- drivers/net/ibm_newemac/zmii.c | 8 +++++--- drivers/net/ll_temac_main.c | 2 +- drivers/net/myri_sbus.c | 7 +++++-- drivers/net/niu.c | 7 +++++-- drivers/net/phy/mdio-gpio.c | 7 +++++-- drivers/net/sunbmac.c | 7 +++++-- drivers/net/sunhme.c | 7 +++++-- drivers/net/sunlance.c | 7 +++++-- drivers/net/sunqe.c | 7 +++++-- drivers/net/ucc_geth.c | 7 +++++-- drivers/net/xilinx_emaclite.c | 7 +++++-- 23 files changed, 112 insertions(+), 54 deletions(-)
drivers/net/can/mscan/mpc5xxx_can.c +5 -3
@@ -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 )
drivers/net/can/sja1000/sja1000_of_platform.c +5 -3
@@ -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 )
drivers/net/ehea/ehea_main.c +5 -2
@@ -121,8 +121,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 = { + .owner =THIS_MODULE , + .name ="ehea" , + .of_match_table = ehea_device_table, + }, .probe = ehea_probe_adapter, .remove = ehea_remove, };
drivers/net/fs_enet/fs_enet-main.c +5 -2
@@ -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, };
drivers/net/fs_enet/mii-bitbang.c +5 -2
@@ -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 = { + .owner =THIS_MODULE , + .name ="fsl-bb-mdio" , + .of_match_table = fs_enet_mdio_bb_match, + }, .probe = fs_enet_mdio_probe, .remove = fs_enet_mdio_remove, };
drivers/net/fs_enet/mii-fec.c +5 -2
@@ -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, };
drivers/net/fsl_pq_mdio.c +5 -2
@@ -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 )
drivers/net/gianfar.c +6 -4
@@ -3050,14 +3050,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 )
drivers/net/ibm_newemac/core.c +5 -3
@@ -2995,9 +2995,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, };
drivers/net/ibm_newemac/mal.c +5 -3
@@ -789,9 +789,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, };
drivers/net/ibm_newemac/rgmii.c +5 -3
@@ -318,9 +318,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, };
drivers/net/ibm_newemac/tah.c +5 -3
@@ -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, };
drivers/net/ibm_newemac/zmii.c +5 -3
@@ -312,9 +312,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, };
drivers/net/ll_temac_main.c +1 -1
@@ -954,12 +954,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, }, };
drivers/net/myri_sbus.c +5 -2
@@ -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), };
drivers/net/niu.c +5 -2
@@ -10206,8 +10206,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), };
drivers/net/phy/mdio-gpio.c +5 -2
@@ -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), };
drivers/net/sunbmac.c +5 -2
@@ -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), };
drivers/net/sunhme.c +5 -2
@@ -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), };
drivers/net/sunlance.c +5 -2
@@ -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), };
drivers/net/sunqe.c +5 -2
@@ -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), };
drivers/net/ucc_geth.c +5 -2
@@ -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,
drivers/net/xilinx_emaclite.c +5 -2
@@ -1292,8 +1292,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), };
PATCH 13/27 drivers/net/of: don't use deprecated field in of_platform_driver
In reply to Grant Likely.name, .match_table and .owner are duplicated in both of_platform_driver and device_driver, so the of_platform_driver copies will be removed soon.
---
drivers/net/can/mscan/mpc5xxx_can.c | 8 +++++--- drivers/net/can/sja1000/sja1000_of_platform.c | 8 +++++--- drivers/net/ehea/ehea_main.c | 7 +++++-- drivers/net/fs_enet/fs_enet-main.c | 7 +++++-- drivers/net/fs_enet/mii-bitbang.c | 7 +++++-- drivers/net/fs_enet/mii-fec.c | 7 +++++-- drivers/net/fsl_pq_mdio.c | 7 +++++-- drivers/net/gianfar.c | 10 ++++++---- drivers/net/ibm_newemac/core.c | 8 +++++--- drivers/net/ibm_newemac/mal.c | 8 +++++--- drivers/net/ibm_newemac/rgmii.c | 8 +++++--- drivers/net/ibm_newemac/tah.c | 8 +++++--- drivers/net/ibm_newemac/zmii.c | 8 +++++--- drivers/net/ll_temac_main.c | 2 +- drivers/net/myri_sbus.c | 7 +++++-- drivers/net/niu.c | 7 +++++-- drivers/net/phy/mdio-gpio.c | 7 +++++-- drivers/net/sunbmac.c | 7 +++++-- drivers/net/sunhme.c | 7 +++++-- drivers/net/sunlance.c | 7 +++++-- drivers/net/sunqe.c | 7 +++++-- drivers/net/ucc_geth.c | 7 +++++-- drivers/net/xilinx_emaclite.c | 7 +++++-- 23 files changed, 112 insertions(+), 54 deletions(-)
drivers/net/can/mscan/mpc5xxx_can.c +5 -3
@@ -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 )
drivers/net/can/sja1000/sja1000_of_platform.c +5 -3
@@ -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 )
drivers/net/ehea/ehea_main.c +5 -2
@@ -121,8 +121,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 = { + .owner =THIS_MODULE , + .name ="ehea" , + .of_match_table = ehea_device_table, + }, .probe = ehea_probe_adapter, .remove = ehea_remove, };
drivers/net/fs_enet/fs_enet-main.c +5 -2
@@ -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, };
drivers/net/fs_enet/mii-bitbang.c +5 -2
@@ -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 = { + .owner =THIS_MODULE , + .name ="fsl-bb-mdio" , + .of_match_table = fs_enet_mdio_bb_match, + }, .probe = fs_enet_mdio_probe, .remove = fs_enet_mdio_remove, };
drivers/net/fs_enet/mii-fec.c +5 -2
@@ -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, };
drivers/net/fsl_pq_mdio.c +5 -2
@@ -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 )
drivers/net/gianfar.c +6 -4
@@ -3050,14 +3050,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 )
drivers/net/ibm_newemac/core.c +5 -3
@@ -2995,9 +2995,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, };
drivers/net/ibm_newemac/mal.c +5 -3
@@ -789,9 +789,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, };
drivers/net/ibm_newemac/rgmii.c +5 -3
@@ -318,9 +318,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, };
drivers/net/ibm_newemac/tah.c +5 -3
@@ -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, };
drivers/net/ibm_newemac/zmii.c +5 -3
@@ -312,9 +312,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, };
drivers/net/ll_temac_main.c +1 -1
@@ -954,12 +954,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, }, };
drivers/net/myri_sbus.c +5 -2
@@ -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), };
drivers/net/niu.c +5 -2
@@ -10206,8 +10206,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), };
drivers/net/phy/mdio-gpio.c +5 -2
@@ -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), };
drivers/net/sunbmac.c +5 -2
@@ -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), };
drivers/net/sunhme.c +5 -2
@@ -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), };
drivers/net/sunlance.c +5 -2
@@ -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), };
drivers/net/sunqe.c +5 -2
@@ -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), };
drivers/net/ucc_geth.c +5 -2
@@ -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,
drivers/net/xilinx_emaclite.c +5 -2
@@ -1292,8 +1292,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), };
PATCH 18/27 drivers/parport/of: don't use deprecated field in of_platform_driver
In reply to Grant Likely.name, .match_table and .owner are duplicated in both of_platform_driver and device_driver, so the of_platform_driver copies will be removed soon.
---
drivers/parport/parport_sunbpp.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-)
drivers/parport/parport_sunbpp.c +5 -2
@@ -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), };
PATCH 13/27 drivers/net/of: don't use deprecated field in of_platform_driver
In reply to Grant Likely.name, .match_table and .owner are duplicated in both of_platform_driver and device_driver, so the of_platform_driver copies will be removed soon.
---
drivers/net/can/mscan/mpc5xxx_can.c | 8 +++++--- drivers/net/can/sja1000/sja1000_of_platform.c | 8 +++++--- drivers/net/ehea/ehea_main.c | 7 +++++-- drivers/net/fs_enet/fs_enet-main.c | 7 +++++-- drivers/net/fs_enet/mii-bitbang.c | 7 +++++-- drivers/net/fs_enet/mii-fec.c | 7 +++++-- drivers/net/fsl_pq_mdio.c | 7 +++++-- drivers/net/gianfar.c | 10 ++++++---- drivers/net/ibm_newemac/core.c | 8 +++++--- drivers/net/ibm_newemac/mal.c | 8 +++++--- drivers/net/ibm_newemac/rgmii.c | 8 +++++--- drivers/net/ibm_newemac/tah.c | 8 +++++--- drivers/net/ibm_newemac/zmii.c | 8 +++++--- drivers/net/ll_temac_main.c | 2 +- drivers/net/myri_sbus.c | 7 +++++-- drivers/net/niu.c | 7 +++++-- drivers/net/phy/mdio-gpio.c | 7 +++++-- drivers/net/sunbmac.c | 7 +++++-- drivers/net/sunhme.c | 7 +++++-- drivers/net/sunlance.c | 7 +++++-- drivers/net/sunqe.c | 7 +++++-- drivers/net/ucc_geth.c | 7 +++++-- drivers/net/xilinx_emaclite.c | 7 +++++-- 23 files changed, 112 insertions(+), 54 deletions(-)
drivers/net/can/mscan/mpc5xxx_can.c +5 -3
@@ -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 )
drivers/net/can/sja1000/sja1000_of_platform.c +5 -3
@@ -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 )
drivers/net/ehea/ehea_main.c +5 -2
@@ -121,8 +121,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 = { + .owner =THIS_MODULE , + .name ="ehea" , + .of_match_table = ehea_device_table, + }, .probe = ehea_probe_adapter, .remove = ehea_remove, };
drivers/net/fs_enet/fs_enet-main.c +5 -2
@@ -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, };
drivers/net/fs_enet/mii-bitbang.c +5 -2
@@ -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 = { + .owner =THIS_MODULE , + .name ="fsl-bb-mdio" , + .of_match_table = fs_enet_mdio_bb_match, + }, .probe = fs_enet_mdio_probe, .remove = fs_enet_mdio_remove, };
drivers/net/fs_enet/mii-fec.c +5 -2
@@ -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, };
drivers/net/fsl_pq_mdio.c +5 -2
@@ -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 )
drivers/net/gianfar.c +6 -4
@@ -3050,14 +3050,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 )
drivers/net/ibm_newemac/core.c +5 -3
@@ -2995,9 +2995,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, };
drivers/net/ibm_newemac/mal.c +5 -3
@@ -789,9 +789,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, };
drivers/net/ibm_newemac/rgmii.c +5 -3
@@ -318,9 +318,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, };
drivers/net/ibm_newemac/tah.c +5 -3
@@ -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, };
drivers/net/ibm_newemac/zmii.c +5 -3
@@ -312,9 +312,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, };
drivers/net/ll_temac_main.c +1 -1
@@ -954,12 +954,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, }, };
drivers/net/myri_sbus.c +5 -2
@@ -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), };
drivers/net/niu.c +5 -2
@@ -10206,8 +10206,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), };
drivers/net/phy/mdio-gpio.c +5 -2
@@ -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), };
drivers/net/sunbmac.c +5 -2
@@ -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), };
drivers/net/sunhme.c +5 -2
@@ -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), };
drivers/net/sunlance.c +5 -2
@@ -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), };
drivers/net/sunqe.c +5 -2
@@ -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), };
drivers/net/ucc_geth.c +5 -2
@@ -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,
drivers/net/xilinx_emaclite.c +5 -2
@@ -1292,8 +1292,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), };
PATCH 14/27 drivers/serial/of: don't use deprecated field in of_platform_driver
In reply to Grant Likely.name, .match_table and .owner are duplicated in both of_platform_driver and device_driver, so the of_platform_driver copies will be removed soon.
---
drivers/serial/apbuart.c | 8 ++++---- drivers/serial/cpm_uart/cpm_uart_core.c | 7 +++++-- drivers/serial/mpc52xx_uart.c | 7 ++++--- drivers/serial/of_serial.c | 8 +++++--- drivers/serial/sunhv.c | 7 +++++-- drivers/serial/sunsab.c | 7 +++++-- drivers/serial/sunsu.c | 7 +++++-- drivers/serial/sunzilog.c | 7 +++++-- drivers/serial/uartlite.c | 5 ++--- drivers/serial/ucc_uart.c | 8 +++++--- 10 files changed, 45 insertions(+), 26 deletions(-)
drivers/serial/apbuart.c +4 -4
@@ -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, + }, };
drivers/serial/cpm_uart/cpm_uart_core.c +5 -2
@@ -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, };
drivers/serial/mpc52xx_uart.c +4 -3
@@ -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, }, };
drivers/serial/of_serial.c +5 -3
@@ -174,11 +174,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 )
drivers/serial/sunhv.c +5 -2
@@ -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), };
drivers/serial/sunsab.c +5 -2
@@ -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), };
drivers/serial/sunsu.c +5 -2
@@ -1536,8 +1536,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), };
drivers/serial/sunzilog.c +5 -2
@@ -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), };
drivers/serial/uartlite.c +2 -3
@@ -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, }, };
drivers/serial/ucc_uart.c +5 -3
@@ -1485,9 +1485,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, };
PATCH 14/27 drivers/serial/of: don't use deprecated field in of_platform_driver
In reply to Grant Likely.name, .match_table and .owner are duplicated in both of_platform_driver and device_driver, so the of_platform_driver copies will be removed soon.
---
drivers/serial/apbuart.c | 8 ++++---- drivers/serial/cpm_uart/cpm_uart_core.c | 7 +++++-- drivers/serial/mpc52xx_uart.c | 7 ++++--- drivers/serial/of_serial.c | 8 +++++--- drivers/serial/sunhv.c | 7 +++++-- drivers/serial/sunsab.c | 7 +++++-- drivers/serial/sunsu.c | 7 +++++-- drivers/serial/sunzilog.c | 7 +++++-- drivers/serial/uartlite.c | 5 ++--- drivers/serial/ucc_uart.c | 8 +++++--- 10 files changed, 45 insertions(+), 26 deletions(-)
drivers/serial/apbuart.c +4 -4
@@ -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, + }, };
drivers/serial/cpm_uart/cpm_uart_core.c +5 -2
@@ -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, };
drivers/serial/mpc52xx_uart.c +4 -3
@@ -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, }, };
drivers/serial/of_serial.c +5 -3
@@ -174,11 +174,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 )
drivers/serial/sunhv.c +5 -2
@@ -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), };
drivers/serial/sunsab.c +5 -2
@@ -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), };
drivers/serial/sunsu.c +5 -2
@@ -1536,8 +1536,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), };
drivers/serial/sunzilog.c +5 -2
@@ -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), };
drivers/serial/uartlite.c +2 -3
@@ -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, }, };
drivers/serial/ucc_uart.c +5 -3
@@ -1485,9 +1485,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, };
PATCH 14/27 drivers/serial/of: don't use deprecated field in of_platform_driver
In reply to Grant Likely.name, .match_table and .owner are duplicated in both of_platform_driver and device_driver, so the of_platform_driver copies will be removed soon.
---
drivers/serial/apbuart.c | 8 ++++---- drivers/serial/cpm_uart/cpm_uart_core.c | 7 +++++-- drivers/serial/mpc52xx_uart.c | 7 ++++--- drivers/serial/of_serial.c | 8 +++++--- drivers/serial/sunhv.c | 7 +++++-- drivers/serial/sunsab.c | 7 +++++-- drivers/serial/sunsu.c | 7 +++++-- drivers/serial/sunzilog.c | 7 +++++-- drivers/serial/uartlite.c | 5 ++--- drivers/serial/ucc_uart.c | 8 +++++--- 10 files changed, 45 insertions(+), 26 deletions(-)
drivers/serial/apbuart.c +4 -4
@@ -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, + }, };
drivers/serial/cpm_uart/cpm_uart_core.c +5 -2
@@ -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, };
drivers/serial/mpc52xx_uart.c +4 -3
@@ -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, }, };
drivers/serial/of_serial.c +5 -3
@@ -174,11 +174,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 )
drivers/serial/sunhv.c +5 -2
@@ -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), };
drivers/serial/sunsab.c +5 -2
@@ -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), };
drivers/serial/sunsu.c +5 -2
@@ -1536,8 +1536,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), };
drivers/serial/sunzilog.c +5 -2
@@ -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), };
drivers/serial/uartlite.c +2 -3
@@ -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, }, };
drivers/serial/ucc_uart.c +5 -3
@@ -1485,9 +1485,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, };
PATCH 19/27 drivers/pcmcia/of: don't use deprecated field in of_platform_driver
In reply to Grant Likely.name, .match_table and .owner are duplicated in both of_platform_driver and device_driver, so the of_platform_driver copies will be removed soon.
---
drivers/pcmcia/electra_cf.c | 7 +++++-- drivers/pcmcia/m8xx_pcmcia.c | 7 +++++-- 2 files changed, 10 insertions(+), 4 deletions(-)
drivers/pcmcia/electra_cf.c +5 -2
@@ -356,8 +356,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, };
drivers/pcmcia/m8xx_pcmcia.c +5 -2
@@ -1314,8 +1314,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, .suspend = m8xx_suspend,
PATCH 14/27 drivers/serial/of: don't use deprecated field in of_platform_driver
In reply to Grant Likely.name, .match_table and .owner are duplicated in both of_platform_driver and device_driver, so the of_platform_driver copies will be removed soon.
---
drivers/serial/apbuart.c | 8 ++++---- drivers/serial/cpm_uart/cpm_uart_core.c | 7 +++++-- drivers/serial/mpc52xx_uart.c | 7 ++++--- drivers/serial/of_serial.c | 8 +++++--- drivers/serial/sunhv.c | 7 +++++-- drivers/serial/sunsab.c | 7 +++++-- drivers/serial/sunsu.c | 7 +++++-- drivers/serial/sunzilog.c | 7 +++++-- drivers/serial/uartlite.c | 5 ++--- drivers/serial/ucc_uart.c | 8 +++++--- 10 files changed, 45 insertions(+), 26 deletions(-)
drivers/serial/apbuart.c +4 -4
@@ -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, + }, };
drivers/serial/cpm_uart/cpm_uart_core.c +5 -2
@@ -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, };
drivers/serial/mpc52xx_uart.c +4 -3
@@ -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, }, };
drivers/serial/of_serial.c +5 -3
@@ -174,11 +174,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 )
drivers/serial/sunhv.c +5 -2
@@ -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), };
drivers/serial/sunsab.c +5 -2
@@ -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), };
drivers/serial/sunsu.c +5 -2
@@ -1536,8 +1536,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), };
drivers/serial/sunzilog.c +5 -2
@@ -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), };
drivers/serial/uartlite.c +2 -3
@@ -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, }, };
drivers/serial/ucc_uart.c +5 -3
@@ -1485,9 +1485,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, };
PATCH 15/27 drivers/spi/of: don't use deprecated field in of_platform_driver
In reply to Grant Likely.name, .match_table and .owner are duplicated in both of_platform_driver and device_driver, so the of_platform_driver copies will be removed soon.
---
drivers/spi/mpc52xx_psc_spi.c | 4 +--- drivers/spi/mpc52xx_spi.c | 8 +++++--- drivers/spi/spi_mpc8xxx.c | 7 +++++-- drivers/spi/spi_ppc4xx.c | 2 +- drivers/spi/xilinx_spi_of.c | 2 +- 5 files changed, 13 insertions(+), 10 deletions(-)
drivers/spi/mpc52xx_psc_spi.c +1 -3
@@ -513,14 +513,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, }, };
drivers/spi/mpc52xx_spi.c +5 -3
@@ -557,9 +557,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), };
drivers/spi/spi_mpc8xxx.c +5 -2
@@ -1311,8 +1311,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), };
drivers/spi/spi_ppc4xx.c +1 -1
@@ -586,12 +586,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, }, };
drivers/spi/xilinx_spi_of.c +1 -1
@@ -108,12 +108,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, }, };
PATCH 15/27 drivers/spi/of: don't use deprecated field in of_platform_driver
In reply to Grant Likely.name, .match_table and .owner are duplicated in both of_platform_driver and device_driver, so the of_platform_driver copies will be removed soon.
---
drivers/spi/mpc52xx_psc_spi.c | 4 +--- drivers/spi/mpc52xx_spi.c | 8 +++++--- drivers/spi/spi_mpc8xxx.c | 7 +++++-- drivers/spi/spi_ppc4xx.c | 2 +- drivers/spi/xilinx_spi_of.c | 2 +- 5 files changed, 13 insertions(+), 10 deletions(-)
drivers/spi/mpc52xx_psc_spi.c +1 -3
@@ -513,14 +513,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, }, };
drivers/spi/mpc52xx_spi.c +5 -3
@@ -557,9 +557,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), };
drivers/spi/spi_mpc8xxx.c +5 -2
@@ -1311,8 +1311,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), };
drivers/spi/spi_ppc4xx.c +1 -1
@@ -586,12 +586,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, }, };
drivers/spi/xilinx_spi_of.c +1 -1
@@ -108,12 +108,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, }, };
PATCH 15/27 drivers/spi/of: don't use deprecated field in of_platform_driver
In reply to Grant Likely.name, .match_table and .owner are duplicated in both of_platform_driver and device_driver, so the of_platform_driver copies will be removed soon.
---
drivers/spi/mpc52xx_psc_spi.c | 4 +--- drivers/spi/mpc52xx_spi.c | 8 +++++--- drivers/spi/spi_mpc8xxx.c | 7 +++++-- drivers/spi/spi_ppc4xx.c | 2 +- drivers/spi/xilinx_spi_of.c | 2 +- 5 files changed, 13 insertions(+), 10 deletions(-)
drivers/spi/mpc52xx_psc_spi.c +1 -3
@@ -513,14 +513,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, }, };
drivers/spi/mpc52xx_spi.c +5 -3
@@ -557,9 +557,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), };
drivers/spi/spi_mpc8xxx.c +5 -2
@@ -1311,8 +1311,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), };
drivers/spi/spi_ppc4xx.c +1 -1
@@ -586,12 +586,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, }, };
drivers/spi/xilinx_spi_of.c +1 -1
@@ -108,12 +108,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, }, };
PATCH 15/27 drivers/spi/of: don't use deprecated field in of_platform_driver
In reply to Grant Likely.name, .match_table and .owner are duplicated in both of_platform_driver and device_driver, so the of_platform_driver copies will be removed soon.
---
drivers/spi/mpc52xx_psc_spi.c | 4 +--- drivers/spi/mpc52xx_spi.c | 8 +++++--- drivers/spi/spi_mpc8xxx.c | 7 +++++-- drivers/spi/spi_ppc4xx.c | 2 +- drivers/spi/xilinx_spi_of.c | 2 +- 5 files changed, 13 insertions(+), 10 deletions(-)
drivers/spi/mpc52xx_psc_spi.c +1 -3
@@ -513,14 +513,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, }, };
drivers/spi/mpc52xx_spi.c +5 -3
@@ -557,9 +557,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), };
drivers/spi/spi_mpc8xxx.c +5 -2
@@ -1311,8 +1311,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), };
drivers/spi/spi_ppc4xx.c +1 -1
@@ -586,12 +586,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, }, };
drivers/spi/xilinx_spi_of.c +1 -1
@@ -108,12 +108,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, }, };
PATCH 20/27 drivers/mmc/of: don't use deprecated field in of_platform_driver
In reply to Grant Likely.name, .match_table and .owner are duplicated in both of_platform_driver and device_driver, so the of_platform_driver copies will be removed soon.
---
drivers/mmc/host/sdhci-of-core.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-)
drivers/mmc/host/sdhci-of-core.c +5 -2
@@ -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,
PATCH 16/27 drivers/scsi/of: don't use deprecated field in of_platform_driver
In reply to Grant Likely.name, .match_table and .owner are duplicated in both of_platform_driver and device_driver, so the of_platform_driver copies will be removed soon.
---
drivers/scsi/qlogicpti.c | 7 +++++-- drivers/scsi/sun_esp.c | 7 +++++-- 2 files changed, 10 insertions(+), 4 deletions(-)
drivers/scsi/qlogicpti.c +5 -2
@@ -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), };
drivers/scsi/sun_esp.c +5 -2
@@ -632,8 +632,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), };
PATCH 16/27 drivers/scsi/of: don't use deprecated field in of_platform_driver
In reply to Grant Likely.name, .match_table and .owner are duplicated in both of_platform_driver and device_driver, so the of_platform_driver copies will be removed soon.
---
drivers/scsi/qlogicpti.c | 7 +++++-- drivers/scsi/sun_esp.c | 7 +++++-- 2 files changed, 10 insertions(+), 4 deletions(-)
drivers/scsi/qlogicpti.c +5 -2
@@ -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), };
drivers/scsi/sun_esp.c +5 -2
@@ -632,8 +632,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), };
PATCH 16/27 drivers/scsi/of: don't use deprecated field in of_platform_driver
In reply to Grant Likely.name, .match_table and .owner are duplicated in both of_platform_driver and device_driver, so the of_platform_driver copies will be removed soon.
---
drivers/scsi/qlogicpti.c | 7 +++++-- drivers/scsi/sun_esp.c | 7 +++++-- 2 files changed, 10 insertions(+), 4 deletions(-)
drivers/scsi/qlogicpti.c +5 -2
@@ -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), };
drivers/scsi/sun_esp.c +5 -2
@@ -632,8 +632,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), };
PATCH 16/27 drivers/scsi/of: don't use deprecated field in of_platform_driver
In reply to Grant Likely.name, .match_table and .owner are duplicated in both of_platform_driver and device_driver, so the of_platform_driver copies will be removed soon.
---
drivers/scsi/qlogicpti.c | 7 +++++-- drivers/scsi/sun_esp.c | 7 +++++-- 2 files changed, 10 insertions(+), 4 deletions(-)
drivers/scsi/qlogicpti.c +5 -2
@@ -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), };
drivers/scsi/sun_esp.c +5 -2
@@ -632,8 +632,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), };
PATCH 21/27 drivers/hwmon/of: don't use deprecated field in of_platform_driver
In reply to Grant Likely.name, .match_table and .owner are duplicated in both of_platform_driver and device_driver, so the of_platform_driver copies will be removed soon.
---
drivers/hwmon/ultra45_env.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-)
drivers/hwmon/ultra45_env.c +5 -2
@@ -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), };
PATCH 17/27 drivers/sbus/of: don't use deprecated field in of_platform_driver
In reply to Grant Likely.name, .match_table and .owner are duplicated in both of_platform_driver and device_driver, so the of_platform_driver copies will be removed soon.
---
drivers/sbus/char/bbc_i2c.c | 7 +++++-- drivers/sbus/char/display7seg.c | 7 +++++-- drivers/sbus/char/envctrl.c | 7 +++++-- drivers/sbus/char/flash.c | 7 +++++-- drivers/sbus/char/uctrl.c | 7 +++++-- 5 files changed, 25 insertions(+), 10 deletions(-)
drivers/sbus/char/bbc_i2c.c +5 -2
@@ -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), };
drivers/sbus/char/display7seg.c +5 -2
@@ -265,8 +265,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), };
drivers/sbus/char/envctrl.c +5 -2
@@ -1130,8 +1130,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), };
drivers/sbus/char/flash.c +5 -2
@@ -208,8 +208,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), };
drivers/sbus/char/uctrl.c +5 -2
@@ -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), };
PATCH 17/27 drivers/sbus/of: don't use deprecated field in of_platform_driver
In reply to Grant Likely.name, .match_table and .owner are duplicated in both of_platform_driver and device_driver, so the of_platform_driver copies will be removed soon.
---
drivers/sbus/char/bbc_i2c.c | 7 +++++-- drivers/sbus/char/display7seg.c | 7 +++++-- drivers/sbus/char/envctrl.c | 7 +++++-- drivers/sbus/char/flash.c | 7 +++++-- drivers/sbus/char/uctrl.c | 7 +++++-- 5 files changed, 25 insertions(+), 10 deletions(-)
drivers/sbus/char/bbc_i2c.c +5 -2
@@ -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), };
drivers/sbus/char/display7seg.c +5 -2
@@ -265,8 +265,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), };
drivers/sbus/char/envctrl.c +5 -2
@@ -1130,8 +1130,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), };
drivers/sbus/char/flash.c +5 -2
@@ -208,8 +208,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), };
drivers/sbus/char/uctrl.c +5 -2
@@ -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), };
PATCH 17/27 drivers/sbus/of: don't use deprecated field in of_platform_driver
In reply to Grant Likely.name, .match_table and .owner are duplicated in both of_platform_driver and device_driver, so the of_platform_driver copies will be removed soon.
---
drivers/sbus/char/bbc_i2c.c | 7 +++++-- drivers/sbus/char/display7seg.c | 7 +++++-- drivers/sbus/char/envctrl.c | 7 +++++-- drivers/sbus/char/flash.c | 7 +++++-- drivers/sbus/char/uctrl.c | 7 +++++-- 5 files changed, 25 insertions(+), 10 deletions(-)
drivers/sbus/char/bbc_i2c.c +5 -2
@@ -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), };
drivers/sbus/char/display7seg.c +5 -2
@@ -265,8 +265,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), };
drivers/sbus/char/envctrl.c +5 -2
@@ -1130,8 +1130,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), };
drivers/sbus/char/flash.c +5 -2
@@ -208,8 +208,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), };
drivers/sbus/char/uctrl.c +5 -2
@@ -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), };
PATCH 17/27 drivers/sbus/of: don't use deprecated field in of_platform_driver
In reply to Grant Likely.name, .match_table and .owner are duplicated in both of_platform_driver and device_driver, so the of_platform_driver copies will be removed soon.
---
drivers/sbus/char/bbc_i2c.c | 7 +++++-- drivers/sbus/char/display7seg.c | 7 +++++-- drivers/sbus/char/envctrl.c | 7 +++++-- drivers/sbus/char/flash.c | 7 +++++-- drivers/sbus/char/uctrl.c | 7 +++++-- 5 files changed, 25 insertions(+), 10 deletions(-)
drivers/sbus/char/bbc_i2c.c +5 -2
@@ -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), };
drivers/sbus/char/display7seg.c +5 -2
@@ -265,8 +265,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), };
drivers/sbus/char/envctrl.c +5 -2
@@ -1130,8 +1130,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), };
drivers/sbus/char/flash.c +5 -2
@@ -208,8 +208,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), };
drivers/sbus/char/uctrl.c +5 -2
@@ -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), };
PATCH 22/27 drivers/i2c/of: don't use deprecated field in of_platform_driver
In reply to Grant Likely.name, .match_table and .owner are duplicated in both of_platform_driver and device_driver, so the of_platform_driver copies will be removed soon.
---
drivers/i2c/busses/i2c-cpm.c | 10 +++++----- drivers/i2c/busses/i2c-ibm_iic.c | 7 +++++-- drivers/i2c/busses/i2c-mpc.c | 8 ++++---- 3 files changed, 14 insertions(+), 11 deletions(-)
drivers/i2c/busses/i2c-cpm.c +5 -5
@@ -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 )
drivers/i2c/busses/i2c-ibm_iic.c +5 -2
@@ -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), };
drivers/i2c/busses/i2c-mpc.c +4 -4
@@ -674,12 +674,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, }, };
PATCH 18/27 drivers/parport/of: don't use deprecated field in of_platform_driver
In reply to Grant Likely.name, .match_table and .owner are duplicated in both of_platform_driver and device_driver, so the of_platform_driver copies will be removed soon.
---
drivers/parport/parport_sunbpp.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-)
drivers/parport/parport_sunbpp.c +5 -2
@@ -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), };
PATCH 23/27 drivers/infiniband/of: don't use deprecated fields in of_platform_driver
In reply to Grant Likely.name, .match_table and .owner are duplicated in both of_platform_driver and device_driver, so the of_platform_driver copies will be removed soon.
---
drivers/infiniband/hw/ehca/ehca_main.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-)
drivers/infiniband/hw/ehca/ehca_main.c +4 -3
@@ -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, }, };
PATCH 18/27 drivers/parport/of: don't use deprecated field in of_platform_driver
In reply to Grant Likely.name, .match_table and .owner are duplicated in both of_platform_driver and device_driver, so the of_platform_driver copies will be removed soon.
---
drivers/parport/parport_sunbpp.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-)
drivers/parport/parport_sunbpp.c +5 -2
@@ -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), };
PATCH 18/27 drivers/parport/of: don't use deprecated field in of_platform_driver
In reply to Grant Likely.name, .match_table and .owner are duplicated in both of_platform_driver and device_driver, so the of_platform_driver copies will be removed soon.
---
drivers/parport/parport_sunbpp.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-)
drivers/parport/parport_sunbpp.c +5 -2
@@ -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), };
PATCH 18/27 drivers/parport/of: don't use deprecated field in of_platform_driver
In reply to Grant Likely.name, .match_table and .owner are duplicated in both of_platform_driver and device_driver, so the of_platform_driver copies will be removed soon.
---
drivers/parport/parport_sunbpp.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-)
drivers/parport/parport_sunbpp.c +5 -2
@@ -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), };
PATCH 19/27 drivers/pcmcia/of: don't use deprecated field in of_platform_driver
In reply to Grant Likely.name, .match_table and .owner are duplicated in both of_platform_driver and device_driver, so the of_platform_driver copies will be removed soon.
---
drivers/pcmcia/electra_cf.c | 7 +++++-- drivers/pcmcia/m8xx_pcmcia.c | 7 +++++-- 2 files changed, 10 insertions(+), 4 deletions(-)
drivers/pcmcia/electra_cf.c +5 -2
@@ -356,8 +356,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, };
drivers/pcmcia/m8xx_pcmcia.c +5 -2
@@ -1314,8 +1314,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, .suspend = m8xx_suspend,
PATCH 19/27 drivers/pcmcia/of: don't use deprecated field in of_platform_driver
In reply to Grant Likely.name, .match_table and .owner are duplicated in both of_platform_driver and device_driver, so the of_platform_driver copies will be removed soon.
---
drivers/pcmcia/electra_cf.c | 7 +++++-- drivers/pcmcia/m8xx_pcmcia.c | 7 +++++-- 2 files changed, 10 insertions(+), 4 deletions(-)
drivers/pcmcia/electra_cf.c +5 -2
@@ -356,8 +356,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, };
drivers/pcmcia/m8xx_pcmcia.c +5 -2
@@ -1314,8 +1314,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, .suspend = m8xx_suspend,
PATCH 24/27 sound/of: don't use deprecated fields in of_platform_driver
In reply to Grant Likely.name, .match_table and .owner are duplicated in both of_platform_driver and device_driver, so the of_platform_driver copies will be removed soon.
---
sound/soc/fsl/mpc5200_psc_ac97.c | 2 +- sound/soc/fsl/mpc5200_psc_i2s.c | 2 +- sound/soc/fsl/mpc8610_hpcd.c | 8 +++++--- sound/sparc/amd7930.c | 7 +++++-- sound/sparc/cs4231.c | 7 +++++-- sound/sparc/dbri.c | 7 +++++-- 6 files changed, 22 insertions(+), 11 deletions(-)
sound/soc/fsl/mpc5200_psc_ac97.c +1 -1
@@ -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, }, };
sound/soc/fsl/mpc5200_psc_i2s.c +1 -1
@@ -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, }, };
sound/soc/fsl/mpc8610_hpcd.c +5 -3
@@ -579,9 +579,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, };
sound/sparc/amd7930.c +5 -2
@@ -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, };
sound/sparc/cs4231.c +5 -2
@@ -2110,8 +2110,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), };
sound/sparc/dbri.c +5 -2
@@ -2686,8 +2686,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), };
PATCH 19/27 drivers/pcmcia/of: don't use deprecated field in of_platform_driver
In reply to Grant Likely.name, .match_table and .owner are duplicated in both of_platform_driver and device_driver, so the of_platform_driver copies will be removed soon.
---
drivers/pcmcia/electra_cf.c | 7 +++++-- drivers/pcmcia/m8xx_pcmcia.c | 7 +++++-- 2 files changed, 10 insertions(+), 4 deletions(-)
drivers/pcmcia/electra_cf.c +5 -2
@@ -356,8 +356,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, };
drivers/pcmcia/m8xx_pcmcia.c +5 -2
@@ -1314,8 +1314,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, .suspend = m8xx_suspend,
PATCH 19/27 drivers/pcmcia/of: don't use deprecated field in of_platform_driver
In reply to Grant Likely.name, .match_table and .owner are duplicated in both of_platform_driver and device_driver, so the of_platform_driver copies will be removed soon.
---
drivers/pcmcia/electra_cf.c | 7 +++++-- drivers/pcmcia/m8xx_pcmcia.c | 7 +++++-- 2 files changed, 10 insertions(+), 4 deletions(-)
drivers/pcmcia/electra_cf.c +5 -2
@@ -356,8 +356,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, };
drivers/pcmcia/m8xx_pcmcia.c +5 -2
@@ -1314,8 +1314,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, .suspend = m8xx_suspend,
PATCH 19/27 drivers/pcmcia/of: don't use deprecated field in of_platform_driver
In reply to Grant Likely.name, .match_table and .owner are duplicated in both of_platform_driver and device_driver, so the of_platform_driver copies will be removed soon.
---
drivers/pcmcia/electra_cf.c | 7 +++++-- drivers/pcmcia/m8xx_pcmcia.c | 7 +++++-- 2 files changed, 10 insertions(+), 4 deletions(-)
drivers/pcmcia/electra_cf.c +5 -2
@@ -356,8 +356,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, };
drivers/pcmcia/m8xx_pcmcia.c +5 -2
@@ -1314,8 +1314,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, .suspend = m8xx_suspend,
PATCH 20/27 drivers/mmc/of: don't use deprecated field in of_platform_driver
In reply to Grant Likely.name, .match_table and .owner are duplicated in both of_platform_driver and device_driver, so the of_platform_driver copies will be removed soon.
---
drivers/mmc/host/sdhci-of-core.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-)
drivers/mmc/host/sdhci-of-core.c +5 -2
@@ -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,