Clean up of_platform drivers
Subsystems (46)
PATCH 25/27 arch/powerpc/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.
---
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 ++++-- drivers/dma/fsldma.c | 13 +++++++---- drivers/dma/ppc4xx/adma.c | 2 +- drivers/edac/mpc85xx_edac.c | 30 ++++++++++--------------- drivers/edac/ppc4xx_edac.c | 10 ++++---- 19 files changed, 95 insertions(+), 69 deletions(-)
arch/powerpc/kernel/of_platform.c +2 -1
@@ -307,10 +307,11 @@ static struct of_device_id of_pci_phb_ids[] = { };static struct of_platform_driver of_pci_phb_driver = { - .match_table = of_pci_phb_ids, .probe = of_pci_phb_probe, .driver = { .name ="of-pci" , + .owner =THIS_MODULE , + .of_match_table = of_pci_phb_ids, }, };
arch/powerpc/platforms/52xx/mpc52xx_gpio.c +10 -4
@@ -192,8 +192,11 @@ static const struct of_device_id mpc52xx_wkup_gpiochip_match[] = { };static struct of_platform_driver mpc52xx_wkup_gpiochip_driver = { - .name ="gpio_wkup" , - .match_table = mpc52xx_wkup_gpiochip_match, + .driver = { + .name ="gpio_wkup" , + .owner =THIS_MODULE , + .of_match_table = mpc52xx_wkup_gpiochip_match, + }, .probe = mpc52xx_wkup_gpiochip_probe, .remove = mpc52xx_gpiochip_remove, };
@@ -348,8 +351,11 @@ static const struct of_device_id mpc52xx_simple_gpiochip_match[] = { };static struct of_platform_driver mpc52xx_simple_gpiochip_driver = { - .name ="gpio" , - .match_table = mpc52xx_simple_gpiochip_match, + .driver = { + .name ="gpio" , + .owner =THIS_MODULE , + .of_match_table = mpc52xx_simple_gpiochip_match, + }, .probe = mpc52xx_simple_gpiochip_probe, .remove = mpc52xx_gpiochip_remove, };
arch/powerpc/platforms/52xx/mpc52xx_gpt.c +5 -2
@@ -779,8 +779,11 @@ static const struct of_device_id mpc52xx_gpt_match[] = { };static struct of_platform_driver mpc52xx_gpt_driver = { - .name ="mpc52xx-gpt" , - .match_table = mpc52xx_gpt_match, + .driver = { + .name ="mpc52xx-gpt" , + .owner =THIS_MODULE , + .of_match_table = mpc52xx_gpt_match, + }, .probe = mpc52xx_gpt_probe, .remove = mpc52xx_gpt_remove, };
arch/powerpc/platforms/52xx/mpc52xx_lpbfifo.c +5 -3
@@ -535,9 +535,11 @@ static struct of_device_id mpc52xx_lpbfifo_match[] __devinitconst = { };static struct of_platform_driver mpc52xx_lpbfifo_driver = { - .owner =THIS_MODULE , - .name ="mpc52xx-lpbfifo" , - .match_table = mpc52xx_lpbfifo_match, + .driver = { + .name ="mpc52xx-lpbfifo" , + .owner =THIS_MODULE , + .of_match_table = mpc52xx_lpbfifo_match, + }, .probe = mpc52xx_lpbfifo_probe, .remove =__devexit_p (mpc52xx_lpbfifo_remove), };
arch/powerpc/platforms/82xx/ep8248e.c +2 -1
@@ -169,8 +169,9 @@ static const struct of_device_id ep8248e_mdio_match[] = {static struct of_platform_driver ep8248e_mdio_driver = { .driver = { .name ="ep8248e-mdio-bitbang" , + .owner =THIS_MODULE , + .of_match_table = ep8248e_mdio_match, }, - .match_table = ep8248e_mdio_match, .probe = ep8248e_mdio_probe, .remove = ep8248e_mdio_remove, };
arch/powerpc/platforms/83xx/suspend.c +5 -2
@@ -423,8 +423,11 @@ static struct of_device_id pmc_match[] = { };static struct of_platform_driver pmc_driver = { - .name ="mpc83xx-pmc" , - .match_table = pmc_match, + .driver = { + .name ="mpc83xx-pmc" , + .owner =THIS_MODULE , + .of_match_table = pmc_match, + }, .probe = pmc_probe, .remove = pmc_remove };
arch/powerpc/platforms/cell/axon_msi.c +4 -3
@@ -446,11 +446,12 @@ static const struct of_device_id axon_msi_device_id[] = { };static struct of_platform_driver axon_msi_driver = { - .match_table = axon_msi_device_id, .probe = axon_msi_probe, .shutdown = axon_msi_shutdown, - .driver = { - .name ="axon-msi" + .driver = { + .name ="axon-msi" , + .owner =THIS_MODULE , + .of_match_table = axon_msi_device_id, }, };
arch/powerpc/platforms/pasemi/gpio_mdio.c +4 -3
@@ -300,11 +300,12 @@ MODULE_DEVICE_TABLE(of, gpio_mdio_match);static struct of_platform_driver gpio_mdio_driver = { - .match_table = gpio_mdio_match, .probe = gpio_mdio_probe, .remove = gpio_mdio_remove, - .driver = { - .name ="gpio-mdio-bitbang" , + .driver = { + .name ="gpio-mdio-bitbang" , + .owner =THIS_MODULE , + .of_match_table = gpio_mdio_match, }, };
arch/powerpc/sysdev/axonram.c +4 -4
@@ -327,12 +327,12 @@ static struct of_device_id axon_ram_device_id[] = { };static struct of_platform_driver axon_ram_driver = { - .match_table = axon_ram_device_id, .probe = axon_ram_probe, .remove = axon_ram_remove, - .driver = { - .owner =THIS_MODULE , - .name =AXON_RAM_MODULE_NAME , + .driver = { + .name =AXON_RAM_MODULE_NAME , + .owner =THIS_MODULE , + .of_match_table = axon_ram_device_id, }, };
arch/powerpc/sysdev/bestcomm/bestcomm.c +4 -6
@@ -494,14 +494,12 @@ MODULE_DEVICE_TABLE(of, mpc52xx_bcom_of_match);static struct of_platform_driver mpc52xx_bcom_of_platform_driver = { - .owner =THIS_MODULE , - .name =DRIVER_NAME , - .match_table = mpc52xx_bcom_of_match, .probe = mpc52xx_bcom_probe, .remove = mpc52xx_bcom_remove, - .driver = { - .name =DRIVER_NAME , - .owner =THIS_MODULE , + .driver = { + .name =DRIVER_NAME , + .owner =THIS_MODULE , + .of_match_table = mpc52xx_bcom_of_match, }, };
arch/powerpc/sysdev/fsl_msi.c +5 -2
@@ -344,8 +344,11 @@ static const struct of_device_id fsl_of_msi_ids[] = { };static struct of_platform_driver fsl_of_msi_driver = { - .name ="fsl-msi" , - .match_table = fsl_of_msi_ids, + .driver = { + .name ="fsl-msi" , + .owner =THIS_MODULE , + .of_match_table = fsl_of_msi_ids, + }, .probe = fsl_of_msi_probe, };
arch/powerpc/sysdev/fsl_pmc.c +5 -2
@@ -76,8 +76,11 @@ static const struct of_device_id pmc_ids[] = { };static struct of_platform_driver pmc_driver = { - .driver.name ="fsl-pmc" , - .match_table = pmc_ids, + .driver = { + .name ="fsl-pmc" , + .owner =THIS_MODULE , + .of_match_table = pmc_ids, + }, .probe = pmc_probe, };
arch/powerpc/sysdev/fsl_rio.c +5 -2
@@ -1214,8 +1214,11 @@ static const struct of_device_id fsl_of_rio_rpn_ids[] = { };static struct of_platform_driver fsl_of_rio_rpn_driver = { - .name ="fsl-of-rio" , - .match_table = fsl_of_rio_rpn_ids, + .driver = { + .name ="fsl-of-rio" , + .owner =THIS_MODULE , + .of_match_table = fsl_of_rio_rpn_ids, + }, .probe = fsl_of_rio_rpn_probe, };
arch/powerpc/sysdev/pmi.c +4 -3
@@ -205,11 +205,12 @@ static int pmi_of_remove(struct of_device *dev) }static struct of_platform_driver pmi_of_platform_driver = { - .match_table = pmi_match, .probe = pmi_of_probe, .remove = pmi_of_remove, - .driver = { - .name ="pmi" , + .driver = { + .name ="pmi" , + .owner =THIS_MODULE , + .of_match_table = pmi_match, }, };
arch/powerpc/sysdev/qe_lib/qe.c +5 -2
@@ -669,8 +669,11 @@ static const struct of_device_id qe_ids[] = { };static struct of_platform_driver qe_driver = { - .driver.name ="fsl-qe" , - .match_table = qe_ids, + .driver = { + .name ="fsl-qe" , + .owner =THIS_MODULE , + .of_match_table = qe_ids, + }, .probe = qe_probe, .resume = qe_resume, };
drivers/dma/fsldma.c +8 -5
@@ -1407,11 +1407,14 @@ static const struct of_device_id fsldma_of_ids[] = { {} }; -static struct of_platform_driver fsldma_of_driver = { - .name ="fsl-elo-dma" , - .match_table = fsldma_of_ids, - .probe = fsldma_of_probe, - .remove = fsldma_of_remove, +static struct of_platform_driver of_fsl_dma_driver = { + .driver = { + .name ="fsl-elo-dma" , + .owner =THIS_MODULE , + .of_match_table = fsldma_of_ids, + }, + .probe = fsldma_of_probe, + .remove = fsldma_of_remove, };/*----------------------------------------------------------------------------*/
drivers/dma/ppc4xx/adma.c +1 -1
@@ -4948,12 +4948,12 @@ static const struct of_device_id ppc440spe_adma_of_match[] __devinitconst = {MODULE_DEVICE_TABLE (of, ppc440spe_adma_of_match);static struct of_platform_driver ppc440spe_adma_driver = { - .match_table = ppc440spe_adma_of_match, .probe = ppc440spe_adma_probe, .remove =__devexit_p (ppc440spe_adma_remove), .driver = { .name ="PPC440SP(E)-ADMA" , .owner =THIS_MODULE , + .of_match_table = ppc440spe_adma_of_match, }, };
drivers/edac/mpc85xx_edac.c +12 -18
@@ -339,15 +339,13 @@ static struct of_device_id mpc85xx_pci_err_of_match[] = { };static struct of_platform_driver mpc85xx_pci_err_driver = { - .owner =THIS_MODULE , - .name ="mpc85xx_pci_err" , - .match_table = mpc85xx_pci_err_of_match, .probe = mpc85xx_pci_err_probe, .remove =__devexit_p (mpc85xx_pci_err_remove), .driver = { - .name ="mpc85xx_pci_err" , - .owner =THIS_MODULE , - }, + .name ="mpc85xx_pci_err" , + .owner =THIS_MODULE , + .of_match_table = mpc85xx_pci_err_of_match, + }, };#endif /* CONFIG_PCI */
@@ -655,15 +653,13 @@ static struct of_device_id mpc85xx_l2_err_of_match[] = { };static struct of_platform_driver mpc85xx_l2_err_driver = { - .owner =THIS_MODULE , - .name ="mpc85xx_l2_err" , - .match_table = mpc85xx_l2_err_of_match, .probe = mpc85xx_l2_err_probe, .remove = mpc85xx_l2_err_remove, .driver = { - .name ="mpc85xx_l2_err" , - .owner =THIS_MODULE , - }, + .name ="mpc85xx_l2_err" , + .owner =THIS_MODULE , + .of_match_table = mpc85xx_l2_err_of_match, + }, };/**************************** MC Err device ***************************/
@@ -992,15 +988,13 @@ static struct of_device_id mpc85xx_mc_err_of_match[] = { };static struct of_platform_driver mpc85xx_mc_err_driver = { - .owner =THIS_MODULE , - .name ="mpc85xx_mc_err" , - .match_table = mpc85xx_mc_err_of_match, .probe = mpc85xx_mc_err_probe, .remove = mpc85xx_mc_err_remove, .driver = { - .name ="mpc85xx_mc_err" , - .owner =THIS_MODULE , - }, + .name ="mpc85xx_mc_err" , + .owner =THIS_MODULE , + .of_match_table = mpc85xx_mc_err_of_match, + }, };#ifdef CONFIG_MPC85xx
drivers/edac/ppc4xx_edac.c +5 -5
@@ -202,13 +202,13 @@ static struct of_device_id ppc4xx_edac_match[] = { };static struct of_platform_driver ppc4xx_edac_driver = { - .match_table = ppc4xx_edac_match, .probe = ppc4xx_edac_probe, .remove = ppc4xx_edac_remove, - .driver = { - .owner =THIS_MODULE , - .name =PPC4XX_EDAC_MODULE_NAME - } + .driver = { + .owner =THIS_MODULE , + .name =PPC4XX_EDAC_MODULE_NAME + .of_match_table = ppc4xx_edac_match, + }, };/*
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 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 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 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 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 26/27 arch/sparc/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.
---
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 ++++++++++++--------- 14 files changed, 77 insertions(+), 42 deletions(-)
arch/sparc/include/asm/parport.h +5 -2
@@ -232,8 +232,11 @@ static const struct of_device_id ecpp_match[] = { };static struct of_platform_driver ecpp_driver = { - .name ="ecpp" , - .match_table = ecpp_match, + .driver = { + .name ="ecpp" , + .owner =THIS_MODULE , + .of_match_table = ecpp_match, + }, .probe = ecpp_probe, .remove =__devexit_p (ecpp_remove), };
arch/sparc/kernel/apc.c +5 -2
@@ -174,8 +174,11 @@ static struct of_device_id __initdata apc_match[] = {MODULE_DEVICE_TABLE (of, apc_match);static struct of_platform_driver apc_driver = { - .name ="apc" , - .match_table = apc_match, + .driver = { + .name ="apc" , + .owner =THIS_MODULE , + .of_match_table = apc_match, + }, .probe = apc_probe, };
arch/sparc/kernel/auxio_64.c +4 -3
@@ -132,10 +132,11 @@ static int __devinit auxio_probe(struct of_device *dev, const struct of_device_i }static struct of_platform_driver auxio_driver = { - .match_table = auxio_match, .probe = auxio_probe, - .driver = { - .name ="auxio" , + .driver = { + .name ="auxio" , + .owner =THIS_MODULE , + .of_match_table = auxio_match, }, };
arch/sparc/kernel/central.c +8 -6
@@ -148,10 +148,11 @@ static struct of_device_id __initdata clock_board_match[] = { };static struct of_platform_driver clock_board_driver = { - .match_table = clock_board_match, .probe = clock_board_probe, - .driver = { - .name ="clock_board" , + .driver = { + .name ="clock_board" , + .owner =THIS_MODULE , + .of_match_table = clock_board_match, }, };
@@ -253,10 +254,11 @@ static struct of_device_id __initdata fhc_match[] = { };static struct of_platform_driver fhc_driver = { - .match_table = fhc_match, .probe = fhc_probe, - .driver = { - .name ="fhc" , + .driver = { + .name ="fhc" , + .owner =THIS_MODULE , + .of_match_table = fhc_match, }, };
arch/sparc/kernel/chmc.c +5 -2
@@ -811,8 +811,11 @@ static const struct of_device_id us3mc_match[] = {MODULE_DEVICE_TABLE (of, us3mc_match);static struct of_platform_driver us3mc_driver = { - .name ="us3mc" , - .match_table = us3mc_match, + .driver = { + .name ="us3mc" , + .owner =THIS_MODULE , + .of_match_table = us3mc_match, + }, .probe = us3mc_probe, .remove =__devexit_p (us3mc_remove), };
arch/sparc/kernel/pci_fire.c +5 -2
@@ -508,8 +508,11 @@ static struct of_device_id __initdata fire_match[] = { };static struct of_platform_driver fire_driver = { - .name =DRIVER_NAME , - .match_table = fire_match, + .driver = { + .name =DRIVER_NAME , + .owner =THIS_MODULE , + .of_match_table = fire_match, + }, .probe = fire_probe, };
arch/sparc/kernel/pci_psycho.c +5 -2
@@ -602,8 +602,11 @@ static struct of_device_id __initdata psycho_match[] = { };static struct of_platform_driver psycho_driver = { - .name =DRIVER_NAME , - .match_table = psycho_match, + .driver = { + .name =DRIVER_NAME , + .owner =THIS_MODULE , + .of_match_table = psycho_match, + }, .probe = psycho_probe, };
arch/sparc/kernel/pci_sabre.c +5 -2
@@ -596,8 +596,11 @@ static struct of_device_id __initdata sabre_match[] = { };static struct of_platform_driver sabre_driver = { - .name =DRIVER_NAME , - .match_table = sabre_match, + .driver = { + .name =DRIVER_NAME , + .owner =THIS_MODULE , + .of_match_table = sabre_match, + }, .probe = sabre_probe, };
arch/sparc/kernel/pci_schizo.c +5 -2
@@ -1491,8 +1491,11 @@ static struct of_device_id __initdata schizo_match[] = { };static struct of_platform_driver schizo_driver = { - .name =DRIVER_NAME , - .match_table = schizo_match, + .driver = { + .name =DRIVER_NAME , + .owner =THIS_MODULE , + .of_match_table = schizo_match, + }, .probe = schizo_probe, };
arch/sparc/kernel/pci_sun4v.c +5 -2
@@ -1009,8 +1009,11 @@ static struct of_device_id __initdata pci_sun4v_match[] = { };static struct of_platform_driver pci_sun4v_driver = { - .name =DRIVER_NAME , - .match_table = pci_sun4v_match, + .driver = { + .name =DRIVER_NAME , + .owner =THIS_MODULE , + .of_match_table = pci_sun4v_match, + }, .probe = pci_sun4v_probe, };
arch/sparc/kernel/pmc.c +5 -2
@@ -79,8 +79,11 @@ static struct of_device_id __initdata pmc_match[] = {MODULE_DEVICE_TABLE (of, pmc_match);static struct of_platform_driver pmc_driver = { - .name ="pmc" , - .match_table = pmc_match, + .driver = { + .name ="pmc" , + .owner =THIS_MODULE , + .of_match_table = pmc_match, + }, .probe = pmc_probe, };
arch/sparc/kernel/power.c +4 -3
@@ -60,10 +60,11 @@ static struct of_device_id __initdata power_match[] = { };static struct of_platform_driver power_driver = { - .match_table = power_match, .probe = power_probe, - .driver = { - .name ="power" , + .driver = { + .name ="power" , + .owner =THIS_MODULE , + .of_match_table = power_match, }, };
arch/sparc/kernel/time_32.c +4 -3
@@ -185,10 +185,11 @@ static struct of_device_id __initdata clock_match[] = { };static struct of_platform_driver clock_driver = { - .match_table = clock_match, .probe = clock_probe, - .driver = { - .name ="rtc" , + .driver = { + .name ="rtc" , + .owner =THIS_MODULE , + .of_match_table = clock_match, }, };
arch/sparc/kernel/time_64.c +12 -9
@@ -462,10 +462,11 @@ static struct of_device_id __initdata rtc_match[] = { };static struct of_platform_driver rtc_driver = { - .match_table = rtc_match, .probe = rtc_probe, - .driver = { - .name ="rtc" , + .driver = { + .name ="rtc" , + .owner =THIS_MODULE , + .of_match_table = rtc_match, }, };
@@ -494,10 +495,11 @@ static struct of_device_id __initdata bq4802_match[] = { };static struct of_platform_driver bq4802_driver = { - .match_table = bq4802_match, .probe = bq4802_probe, - .driver = { - .name ="bq4802" , + .driver = { + .name ="bq4802" , + .owner =THIS_MODULE , + .of_match_table = bq4802_match, }, };
@@ -557,10 +559,11 @@ static struct of_device_id __initdata mostek_match[] = { };static struct of_platform_driver mostek_driver = { - .match_table = mostek_match, .probe = mostek_probe, - .driver = { - .name ="mostek" , + .driver = { + .name ="mostek" , + .owner =THIS_MODULE , + .of_match_table = mostek_match, }, };
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 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 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, }, };
Re: [PATCH 22/27] drivers/i2c/of: don't use deprecated field in of_platform_driver
Quoted 5 lines · On Thu, 11 Mar 2010 11:23:49 -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]>
i2c-ibm_iic
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 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, }, };
David Miller
maintainerGrant you've just posted two enormous patch sets at the SAME EXACT TIME to the SAME AREAS of the kernel.
One has 37 patches and this one has 27.
Not only are these sets enormous, you haven't specified what in the world they are against.
The 37 patch set didn't apply cleanly to Linus tree and once I worked through the rejects as best I could it didn't even compile.
How are people supposed to test this stuff? :-/
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 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 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 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 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 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 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 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 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 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 25/27 arch/powerpc/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.
---
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 ++++-- drivers/dma/fsldma.c | 13 +++++++---- drivers/dma/ppc4xx/adma.c | 2 +- drivers/edac/mpc85xx_edac.c | 30 ++++++++++--------------- drivers/edac/ppc4xx_edac.c | 10 ++++---- 19 files changed, 95 insertions(+), 69 deletions(-)
arch/powerpc/kernel/of_platform.c +2 -1
@@ -307,10 +307,11 @@ static struct of_device_id of_pci_phb_ids[] = { };static struct of_platform_driver of_pci_phb_driver = { - .match_table = of_pci_phb_ids, .probe = of_pci_phb_probe, .driver = { .name ="of-pci" , + .owner =THIS_MODULE , + .of_match_table = of_pci_phb_ids, }, };
arch/powerpc/platforms/52xx/mpc52xx_gpio.c +10 -4
@@ -192,8 +192,11 @@ static const struct of_device_id mpc52xx_wkup_gpiochip_match[] = { };static struct of_platform_driver mpc52xx_wkup_gpiochip_driver = { - .name ="gpio_wkup" , - .match_table = mpc52xx_wkup_gpiochip_match, + .driver = { + .name ="gpio_wkup" , + .owner =THIS_MODULE , + .of_match_table = mpc52xx_wkup_gpiochip_match, + }, .probe = mpc52xx_wkup_gpiochip_probe, .remove = mpc52xx_gpiochip_remove, };
@@ -348,8 +351,11 @@ static const struct of_device_id mpc52xx_simple_gpiochip_match[] = { };static struct of_platform_driver mpc52xx_simple_gpiochip_driver = { - .name ="gpio" , - .match_table = mpc52xx_simple_gpiochip_match, + .driver = { + .name ="gpio" , + .owner =THIS_MODULE , + .of_match_table = mpc52xx_simple_gpiochip_match, + }, .probe = mpc52xx_simple_gpiochip_probe, .remove = mpc52xx_gpiochip_remove, };
arch/powerpc/platforms/52xx/mpc52xx_gpt.c +5 -2
@@ -779,8 +779,11 @@ static const struct of_device_id mpc52xx_gpt_match[] = { };static struct of_platform_driver mpc52xx_gpt_driver = { - .name ="mpc52xx-gpt" , - .match_table = mpc52xx_gpt_match, + .driver = { + .name ="mpc52xx-gpt" , + .owner =THIS_MODULE , + .of_match_table = mpc52xx_gpt_match, + }, .probe = mpc52xx_gpt_probe, .remove = mpc52xx_gpt_remove, };
arch/powerpc/platforms/52xx/mpc52xx_lpbfifo.c +5 -3
@@ -535,9 +535,11 @@ static struct of_device_id mpc52xx_lpbfifo_match[] __devinitconst = { };static struct of_platform_driver mpc52xx_lpbfifo_driver = { - .owner =THIS_MODULE , - .name ="mpc52xx-lpbfifo" , - .match_table = mpc52xx_lpbfifo_match, + .driver = { + .name ="mpc52xx-lpbfifo" , + .owner =THIS_MODULE , + .of_match_table = mpc52xx_lpbfifo_match, + }, .probe = mpc52xx_lpbfifo_probe, .remove =__devexit_p (mpc52xx_lpbfifo_remove), };
arch/powerpc/platforms/82xx/ep8248e.c +2 -1
@@ -169,8 +169,9 @@ static const struct of_device_id ep8248e_mdio_match[] = {static struct of_platform_driver ep8248e_mdio_driver = { .driver = { .name ="ep8248e-mdio-bitbang" , + .owner =THIS_MODULE , + .of_match_table = ep8248e_mdio_match, }, - .match_table = ep8248e_mdio_match, .probe = ep8248e_mdio_probe, .remove = ep8248e_mdio_remove, };
arch/powerpc/platforms/83xx/suspend.c +5 -2
@@ -423,8 +423,11 @@ static struct of_device_id pmc_match[] = { };static struct of_platform_driver pmc_driver = { - .name ="mpc83xx-pmc" , - .match_table = pmc_match, + .driver = { + .name ="mpc83xx-pmc" , + .owner =THIS_MODULE , + .of_match_table = pmc_match, + }, .probe = pmc_probe, .remove = pmc_remove };
arch/powerpc/platforms/cell/axon_msi.c +4 -3
@@ -446,11 +446,12 @@ static const struct of_device_id axon_msi_device_id[] = { };static struct of_platform_driver axon_msi_driver = { - .match_table = axon_msi_device_id, .probe = axon_msi_probe, .shutdown = axon_msi_shutdown, - .driver = { - .name ="axon-msi" + .driver = { + .name ="axon-msi" , + .owner =THIS_MODULE , + .of_match_table = axon_msi_device_id, }, };
arch/powerpc/platforms/pasemi/gpio_mdio.c +4 -3
@@ -300,11 +300,12 @@ MODULE_DEVICE_TABLE(of, gpio_mdio_match);static struct of_platform_driver gpio_mdio_driver { - .match_table = gpio_mdio_match, .probe = gpio_mdio_probe, .remove = gpio_mdio_remove, - .driver = { - .name = "gpio-mdio-bitbang", + .driver = { + .name = "gpio-mdio-bitbang", + .owner = THIS_MODULE, + .of_match_table = gpio_mdio_match, }, };
arch/powerpc/sysdev/axonram.c +4 -4
@@ -327,12 +327,12 @@ static struct of_device_id axon_ram_device_id[] = { };static struct of_platform_driver axon_ram_driver = { - .match_table = axon_ram_device_id, .probe = axon_ram_probe, .remove = axon_ram_remove, - .driver = { - .owner =THIS_MODULE , - .name =AXON_RAM_MODULE_NAME , + .driver = { + .name =AXON_RAM_MODULE_NAME , + .owner =THIS_MODULE , + .of_match_table = axon_ram_device_id, }, };
arch/powerpc/sysdev/bestcomm/bestcomm.c +4 -6
@@ -494,14 +494,12 @@ MODULE_DEVICE_TABLE(of, mpc52xx_bcom_of_match);static struct of_platform_driver mpc52xx_bcom_of_platform_driver = { - .owner =THIS_MODULE , - .name =DRIVER_NAME , - .match_table = mpc52xx_bcom_of_match, .probe = mpc52xx_bcom_probe, .remove = mpc52xx_bcom_remove, - .driver = { - .name =DRIVER_NAME , - .owner =THIS_MODULE , + .driver = { + .name =DRIVER_NAME , + .owner =THIS_MODULE , + .of_match_table = mpc52xx_bcom_of_match, }, };
arch/powerpc/sysdev/fsl_msi.c +5 -2
@@ -344,8 +344,11 @@ static const struct of_device_id fsl_of_msi_ids[] = { };static struct of_platform_driver fsl_of_msi_driver = { - .name ="fsl-msi" , - .match_table = fsl_of_msi_ids, + .driver = { + .name ="fsl-msi" , + .owner =THIS_MODULE , + .of_match_table = fsl_of_msi_ids, + }, .probe = fsl_of_msi_probe, };
arch/powerpc/sysdev/fsl_pmc.c +5 -2
@@ -76,8 +76,11 @@ static const struct of_device_id pmc_ids[] = { };static struct of_platform_driver pmc_driver = { - .driver.name ="fsl-pmc" , - .match_table = pmc_ids, + .driver = { + .name ="fsl-pmc" , + .owner =THIS_MODULE , + .of_match_table = pmc_ids, + }, .probe = pmc_probe, };
arch/powerpc/sysdev/fsl_rio.c +5 -2
@@ -1214,8 +1214,11 @@ static const struct of_device_id fsl_of_rio_rpn_ids[] = { };static struct of_platform_driver fsl_of_rio_rpn_driver = { - .name ="fsl-of-rio" , - .match_table = fsl_of_rio_rpn_ids, + .driver = { + .name ="fsl-of-rio" , + .owner =THIS_MODULE , + .of_match_table = fsl_of_rio_rpn_ids, + }, .probe = fsl_of_rio_rpn_probe, };
arch/powerpc/sysdev/pmi.c +4 -3
@@ -205,11 +205,12 @@ static int pmi_of_remove(struct of_device *dev) }static struct of_platform_driver pmi_of_platform_driver = { - .match_table = pmi_match, .probe = pmi_of_probe, .remove = pmi_of_remove, - .driver = { - .name ="pmi" , + .driver = { + .name ="pmi" , + .owner =THIS_MODULE , + .of_match_table = pmi_match, }, };
arch/powerpc/sysdev/qe_lib/qe.c +5 -2
@@ -669,8 +669,11 @@ static const struct of_device_id qe_ids[] = { };static struct of_platform_driver qe_driver = { - .driver.name ="fsl-qe" , - .match_table = qe_ids, + .driver = { + .name ="fsl-qe" , + .owner =THIS_MODULE , + .of_match_table = qe_ids, + }, .probe = qe_probe, .resume = qe_resume, };
drivers/dma/fsldma.c +8 -5
@@ -1407,11 +1407,14 @@ static const struct of_device_id fsldma_of_ids[] = { {} }; -static struct of_platform_driver fsldma_of_driver = { - .name ="fsl-elo-dma" , - .match_table = fsldma_of_ids, - .probe = fsldma_of_probe, - .remove = fsldma_of_remove, +static struct of_platform_driver of_fsl_dma_driver = { + .driver = { + .name ="fsl-elo-dma" , + .owner =THIS_MODULE , + .of_match_table = fsldma_of_ids, + }, + .probe = fsldma_of_probe, + .remove = fsldma_of_remove, };/*----------------------------------------------------------------------------*/
drivers/dma/ppc4xx/adma.c +1 -1
@@ -4948,12 +4948,12 @@ static const struct of_device_id ppc440spe_adma_of_match[] __devinitconst = {MODULE_DEVICE_TABLE (of, ppc440spe_adma_of_match);static struct of_platform_driver ppc440spe_adma_driver = { - .match_table = ppc440spe_adma_of_match, .probe = ppc440spe_adma_probe, .remove =__devexit_p (ppc440spe_adma_remove), .driver = { .name ="PPC440SP(E)-ADMA" , .owner =THIS_MODULE , + .of_match_table = ppc440spe_adma_of_match, }, };
drivers/edac/mpc85xx_edac.c +12 -18
@@ -339,15 +339,13 @@ static struct of_device_id mpc85xx_pci_err_of_match[] = { };static struct of_platform_driver mpc85xx_pci_err_driver = { - .owner =THIS_MODULE , - .name ="mpc85xx_pci_err" , - .match_table = mpc85xx_pci_err_of_match, .probe = mpc85xx_pci_err_probe, .remove =__devexit_p (mpc85xx_pci_err_remove), .driver = { - .name ="mpc85xx_pci_err" , - .owner =THIS_MODULE , - }, + .name ="mpc85xx_pci_err" , + .owner =THIS_MODULE , + .of_match_table = mpc85xx_pci_err_of_match, + }, };#endif /* CONFIG_PCI */
@@ -655,15 +653,13 @@ static struct of_device_id mpc85xx_l2_err_of_match[] = { };static struct of_platform_driver mpc85xx_l2_err_driver = { - .owner =THIS_MODULE , - .name ="mpc85xx_l2_err" , - .match_table = mpc85xx_l2_err_of_match, .probe = mpc85xx_l2_err_probe, .remove = mpc85xx_l2_err_remove, .driver = { - .name ="mpc85xx_l2_err" , - .owner =THIS_MODULE , - }, + .name ="mpc85xx_l2_err" , + .owner =THIS_MODULE , + .of_match_table = mpc85xx_l2_err_of_match, + }, };/**************************** MC Err device ***************************/
@@ -992,15 +988,13 @@ static struct of_device_id mpc85xx_mc_err_of_match[] = { };static struct of_platform_driver mpc85xx_mc_err_driver = { - .owner =THIS_MODULE , - .name ="mpc85xx_mc_err" , - .match_table = mpc85xx_mc_err_of_match, .probe = mpc85xx_mc_err_probe, .remove = mpc85xx_mc_err_remove, .driver = { - .name ="mpc85xx_mc_err" , - .owner =THIS_MODULE , - }, + .name ="mpc85xx_mc_err" , + .owner =THIS_MODULE , + .of_match_table = mpc85xx_mc_err_of_match, + }, };#ifdef CONFIG_MPC85xx
drivers/edac/ppc4xx_edac.c +5 -5
@@ -202,13 +202,13 @@ static struct of_device_id ppc4xx_edac_match[] = { };static struct of_platform_driver ppc4xx_edac_driver = { - .match_table = ppc4xx_edac_match, .probe = ppc4xx_edac_probe, .remove = ppc4xx_edac_remove, - .driver = { - .owner =THIS_MODULE , - .name =PPC4XX_EDAC_MODULE_NAME - } + .driver = { + .owner =THIS_MODULE , + .name =PPC4XX_EDAC_MODULE_NAME + .of_match_table = ppc4xx_edac_match, + }, };/*
PATCH 25/27 arch/powerpc/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.
---
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 ++++-- drivers/dma/fsldma.c | 13 +++++++---- drivers/dma/ppc4xx/adma.c | 2 +- drivers/edac/mpc85xx_edac.c | 30 ++++++++++--------------- drivers/edac/ppc4xx_edac.c | 10 ++++---- 19 files changed, 95 insertions(+), 69 deletions(-)
arch/powerpc/kernel/of_platform.c +2 -1
@@ -307,10 +307,11 @@ static struct of_device_id of_pci_phb_ids[] = { };static struct of_platform_driver of_pci_phb_driver = { - .match_table = of_pci_phb_ids, .probe = of_pci_phb_probe, .driver = { .name ="of-pci" , + .owner =THIS_MODULE , + .of_match_table = of_pci_phb_ids, }, };
arch/powerpc/platforms/52xx/mpc52xx_gpio.c +10 -4
@@ -192,8 +192,11 @@ static const struct of_device_id mpc52xx_wkup_gpiochip_match[] = { };static struct of_platform_driver mpc52xx_wkup_gpiochip_driver = { - .name ="gpio_wkup" , - .match_table = mpc52xx_wkup_gpiochip_match, + .driver = { + .name ="gpio_wkup" , + .owner =THIS_MODULE , + .of_match_table = mpc52xx_wkup_gpiochip_match, + }, .probe = mpc52xx_wkup_gpiochip_probe, .remove = mpc52xx_gpiochip_remove, };
@@ -348,8 +351,11 @@ static const struct of_device_id mpc52xx_simple_gpiochip_match[] = { };static struct of_platform_driver mpc52xx_simple_gpiochip_driver = { - .name ="gpio" , - .match_table = mpc52xx_simple_gpiochip_match, + .driver = { + .name ="gpio" , + .owner =THIS_MODULE , + .of_match_table = mpc52xx_simple_gpiochip_match, + }, .probe = mpc52xx_simple_gpiochip_probe, .remove = mpc52xx_gpiochip_remove, };
arch/powerpc/platforms/52xx/mpc52xx_gpt.c +5 -2
@@ -779,8 +779,11 @@ static const struct of_device_id mpc52xx_gpt_match[] = { };static struct of_platform_driver mpc52xx_gpt_driver = { - .name ="mpc52xx-gpt" , - .match_table = mpc52xx_gpt_match, + .driver = { + .name ="mpc52xx-gpt" , + .owner =THIS_MODULE , + .of_match_table = mpc52xx_gpt_match, + }, .probe = mpc52xx_gpt_probe, .remove = mpc52xx_gpt_remove, };
arch/powerpc/platforms/52xx/mpc52xx_lpbfifo.c +5 -3
@@ -535,9 +535,11 @@ static struct of_device_id mpc52xx_lpbfifo_match[] __devinitconst = { };static struct of_platform_driver mpc52xx_lpbfifo_driver = { - .owner =THIS_MODULE , - .name ="mpc52xx-lpbfifo" , - .match_table = mpc52xx_lpbfifo_match, + .driver = { + .name ="mpc52xx-lpbfifo" , + .owner =THIS_MODULE , + .of_match_table = mpc52xx_lpbfifo_match, + }, .probe = mpc52xx_lpbfifo_probe, .remove =__devexit_p (mpc52xx_lpbfifo_remove), };
arch/powerpc/platforms/82xx/ep8248e.c +2 -1
@@ -169,8 +169,9 @@ static const struct of_device_id ep8248e_mdio_match[] = {static struct of_platform_driver ep8248e_mdio_driver = { .driver = { .name ="ep8248e-mdio-bitbang" , + .owner =THIS_MODULE , + .of_match_table = ep8248e_mdio_match, }, - .match_table = ep8248e_mdio_match, .probe = ep8248e_mdio_probe, .remove = ep8248e_mdio_remove, };
arch/powerpc/platforms/83xx/suspend.c +5 -2
@@ -423,8 +423,11 @@ static struct of_device_id pmc_match[] = { };static struct of_platform_driver pmc_driver = { - .name ="mpc83xx-pmc" , - .match_table = pmc_match, + .driver = { + .name ="mpc83xx-pmc" , + .owner =THIS_MODULE , + .of_match_table = pmc_match, + }, .probe = pmc_probe, .remove = pmc_remove };
arch/powerpc/platforms/cell/axon_msi.c +4 -3
@@ -446,11 +446,12 @@ static const struct of_device_id axon_msi_device_id[] = { };static struct of_platform_driver axon_msi_driver = { - .match_table = axon_msi_device_id, .probe = axon_msi_probe, .shutdown = axon_msi_shutdown, - .driver = { - .name ="axon-msi" + .driver = { + .name ="axon-msi" , + .owner =THIS_MODULE , + .of_match_table = axon_msi_device_id, }, };
arch/powerpc/platforms/pasemi/gpio_mdio.c +4 -3
@@ -300,11 +300,12 @@ MODULE_DEVICE_TABLE(of, gpio_mdio_match);static struct of_platform_driver gpio_mdio_driver = { - .match_table = gpio_mdio_match, .probe = gpio_mdio_probe, .remove = gpio_mdio_remove, - .driver = { - .name ="gpio-mdio-bitbang" , + .driver = { + .name ="gpio-mdio-bitbang" , + .owner =THIS_MODULE , + .of_match_table = gpio_mdio_match, }, };
arch/powerpc/sysdev/axonram.c +4 -4
@@ -327,12 +327,12 @@ static struct of_device_id axon_ram_device_id[] = { };static struct of_platform_driver axon_ram_driver = { - .match_table = axon_ram_device_id, .probe = axon_ram_probe, .remove = axon_ram_remove, - .driver = { - .owner =THIS_MODULE , - .name =AXON_RAM_MODULE_NAME , + .driver = { + .name =AXON_RAM_MODULE_NAME , + .owner =THIS_MODULE , + .of_match_table = axon_ram_device_id, }, };
arch/powerpc/sysdev/bestcomm/bestcomm.c +4 -6
@@ -494,14 +494,12 @@ MODULE_DEVICE_TABLE(of, mpc52xx_bcom_of_match);static struct of_platform_driver mpc52xx_bcom_of_platform_driver = { - .owner =THIS_MODULE , - .name =DRIVER_NAME , - .match_table = mpc52xx_bcom_of_match, .probe = mpc52xx_bcom_probe, .remove = mpc52xx_bcom_remove, - .driver = { - .name =DRIVER_NAME , - .owner =THIS_MODULE , + .driver = { + .name =DRIVER_NAME , + .owner =THIS_MODULE , + .of_match_table = mpc52xx_bcom_of_match, }, };
arch/powerpc/sysdev/fsl_msi.c +5 -2
@@ -344,8 +344,11 @@ static const struct of_device_id fsl_of_msi_ids[] = { };static struct of_platform_driver fsl_of_msi_driver = { - .name ="fsl-msi" , - .match_table = fsl_of_msi_ids, + .driver = { + .name ="fsl-msi" , + .owner =THIS_MODULE , + .of_match_table = fsl_of_msi_ids, + }, .probe = fsl_of_msi_probe, };
arch/powerpc/sysdev/fsl_pmc.c +5 -2
@@ -76,8 +76,11 @@ static const struct of_device_id pmc_ids[] = { };static struct of_platform_driver pmc_driver = { - .driver.name ="fsl-pmc" , - .match_table = pmc_ids, + .driver = { + .name ="fsl-pmc" , + .owner =THIS_MODULE , + .of_match_table = pmc_ids, + }, .probe = pmc_probe, };
arch/powerpc/sysdev/fsl_rio.c +5 -2
@@ -1214,8 +1214,11 @@ static const struct of_device_id fsl_of_rio_rpn_ids[] = { };static struct of_platform_driver fsl_of_rio_rpn_driver = { - .name ="fsl-of-rio" , - .match_table = fsl_of_rio_rpn_ids, + .driver = { + .name ="fsl-of-rio" , + .owner =THIS_MODULE , + .of_match_table = fsl_of_rio_rpn_ids, + }, .probe = fsl_of_rio_rpn_probe, };
arch/powerpc/sysdev/pmi.c +4 -3
@@ -205,11 +205,12 @@ static int pmi_of_remove(struct of_device *dev) }static struct of_platform_driver pmi_of_platform_driver = { - .match_table = pmi_match, .probe = pmi_of_probe, .remove = pmi_of_remove, - .driver = { - .name ="pmi" , + .driver = { + .name ="pmi" , + .owner =THIS_MODULE , + .of_match_table = pmi_match, }, };
arch/powerpc/sysdev/qe_lib/qe.c +5 -2
@@ -669,8 +669,11 @@ static const struct of_device_id qe_ids[] = { };static struct of_platform_driver qe_driver = { - .driver.name ="fsl-qe" , - .match_table = qe_ids, + .driver = { + .name ="fsl-qe" , + .owner =THIS_MODULE , + .of_match_table = qe_ids, + }, .probe = qe_probe, .resume = qe_resume, };
drivers/dma/fsldma.c +8 -5
@@ -1407,11 +1407,14 @@ static const struct of_device_id fsldma_of_ids[] = { {} }; -static struct of_platform_driver fsldma_of_driver = { - .name ="fsl-elo-dma" , - .match_table = fsldma_of_ids, - .probe = fsldma_of_probe, - .remove = fsldma_of_remove, +static struct of_platform_driver of_fsl_dma_driver = { + .driver = { + .name ="fsl-elo-dma" , + .owner =THIS_MODULE , + .of_match_table = fsldma_of_ids, + }, + .probe = fsldma_of_probe, + .remove = fsldma_of_remove, };/*----------------------------------------------------------------------------*/
drivers/dma/ppc4xx/adma.c +1 -1
@@ -4948,12 +4948,12 @@ static const struct of_device_id ppc440spe_adma_of_match[] __devinitconst = {MODULE_DEVICE_TABLE (of, ppc440spe_adma_of_match);static struct of_platform_driver ppc440spe_adma_driver = { - .match_table = ppc440spe_adma_of_match, .probe = ppc440spe_adma_probe, .remove =__devexit_p (ppc440spe_adma_remove), .driver = { .name ="PPC440SP(E)-ADMA" , .owner =THIS_MODULE , + .of_match_table = ppc440spe_adma_of_match, }, };
drivers/edac/mpc85xx_edac.c +12 -18
@@ -339,15 +339,13 @@ static struct of_device_id mpc85xx_pci_err_of_match[] = { };static struct of_platform_driver mpc85xx_pci_err_driver = { - .owner =THIS_MODULE , - .name ="mpc85xx_pci_err" , - .match_table = mpc85xx_pci_err_of_match, .probe = mpc85xx_pci_err_probe, .remove =__devexit_p (mpc85xx_pci_err_remove), .driver = { - .name ="mpc85xx_pci_err" , - .owner =THIS_MODULE , - }, + .name ="mpc85xx_pci_err" , + .owner =THIS_MODULE , + .of_match_table = mpc85xx_pci_err_of_match, + }, };#endif /* CONFIG_PCI */
@@ -655,15 +653,13 @@ static struct of_device_id mpc85xx_l2_err_of_match[] = { };static struct of_platform_driver mpc85xx_l2_err_driver = { - .owner =THIS_MODULE , - .name ="mpc85xx_l2_err" , - .match_table = mpc85xx_l2_err_of_match, .probe = mpc85xx_l2_err_probe, .remove = mpc85xx_l2_err_remove, .driver = { - .name ="mpc85xx_l2_err" , - .owner =THIS_MODULE , - }, + .name ="mpc85xx_l2_err" , + .owner =THIS_MODULE , + .of_match_table = mpc85xx_l2_err_of_match, + }, };/**************************** MC Err device ***************************/
@@ -992,15 +988,13 @@ static struct of_device_id mpc85xx_mc_err_of_match[] = { };static struct of_platform_driver mpc85xx_mc_err_driver = { - .owner =THIS_MODULE , - .name ="mpc85xx_mc_err" , - .match_table = mpc85xx_mc_err_of_match, .probe = mpc85xx_mc_err_probe, .remove = mpc85xx_mc_err_remove, .driver = { - .name ="mpc85xx_mc_err" , - .owner =THIS_MODULE , - }, + .name ="mpc85xx_mc_err" , + .owner =THIS_MODULE , + .of_match_table = mpc85xx_mc_err_of_match, + }, };#ifdef CONFIG_MPC85xx
drivers/edac/ppc4xx_edac.c +5 -5
@@ -202,13 +202,13 @@ static struct of_device_id ppc4xx_edac_match[] = { };static struct of_platform_driver ppc4xx_edac_driver = { - .match_table = ppc4xx_edac_match, .probe = ppc4xx_edac_probe, .remove = ppc4xx_edac_remove, - .driver = { - .owner =THIS_MODULE , - .name =PPC4XX_EDAC_MODULE_NAME - } + .driver = { + .owner =THIS_MODULE , + .name =PPC4XX_EDAC_MODULE_NAME + .of_match_table = ppc4xx_edac_match, + }, };/*
PATCH 25/27 arch/powerpc/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.
---
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 ++++-- drivers/dma/fsldma.c | 13 +++++++---- drivers/dma/ppc4xx/adma.c | 2 +- drivers/edac/mpc85xx_edac.c | 30 ++++++++++--------------- drivers/edac/ppc4xx_edac.c | 10 ++++---- 19 files changed, 95 insertions(+), 69 deletions(-)
arch/powerpc/kernel/of_platform.c +2 -1
@@ -307,10 +307,11 @@ static struct of_device_id of_pci_phb_ids[] = { };static struct of_platform_driver of_pci_phb_driver = { - .match_table = of_pci_phb_ids, .probe = of_pci_phb_probe, .driver = { .name ="of-pci" , + .owner =THIS_MODULE , + .of_match_table = of_pci_phb_ids, }, };
arch/powerpc/platforms/52xx/mpc52xx_gpio.c +10 -4
@@ -192,8 +192,11 @@ static const struct of_device_id mpc52xx_wkup_gpiochip_match[] = { };static struct of_platform_driver mpc52xx_wkup_gpiochip_driver = { - .name ="gpio_wkup" , - .match_table = mpc52xx_wkup_gpiochip_match, + .driver = { + .name ="gpio_wkup" , + .owner =THIS_MODULE , + .of_match_table = mpc52xx_wkup_gpiochip_match, + }, .probe = mpc52xx_wkup_gpiochip_probe, .remove = mpc52xx_gpiochip_remove, };
@@ -348,8 +351,11 @@ static const struct of_device_id mpc52xx_simple_gpiochip_match[] = { };static struct of_platform_driver mpc52xx_simple_gpiochip_driver = { - .name ="gpio" , - .match_table = mpc52xx_simple_gpiochip_match, + .driver = { + .name ="gpio" , + .owner =THIS_MODULE , + .of_match_table = mpc52xx_simple_gpiochip_match, + }, .probe = mpc52xx_simple_gpiochip_probe, .remove = mpc52xx_gpiochip_remove, };
arch/powerpc/platforms/52xx/mpc52xx_gpt.c +5 -2
@@ -779,8 +779,11 @@ static const struct of_device_id mpc52xx_gpt_match[] = { };static struct of_platform_driver mpc52xx_gpt_driver = { - .name ="mpc52xx-gpt" , - .match_table = mpc52xx_gpt_match, + .driver = { + .name ="mpc52xx-gpt" , + .owner =THIS_MODULE , + .of_match_table = mpc52xx_gpt_match, + }, .probe = mpc52xx_gpt_probe, .remove = mpc52xx_gpt_remove, };
arch/powerpc/platforms/52xx/mpc52xx_lpbfifo.c +5 -3
@@ -535,9 +535,11 @@ static struct of_device_id mpc52xx_lpbfifo_match[] __devinitconst = { };static struct of_platform_driver mpc52xx_lpbfifo_driver = { - .owner =THIS_MODULE , - .name ="mpc52xx-lpbfifo" , - .match_table = mpc52xx_lpbfifo_match, + .driver = { + .name ="mpc52xx-lpbfifo" , + .owner =THIS_MODULE , + .of_match_table = mpc52xx_lpbfifo_match, + }, .probe = mpc52xx_lpbfifo_probe, .remove =__devexit_p (mpc52xx_lpbfifo_remove), };
arch/powerpc/platforms/82xx/ep8248e.c +2 -1
@@ -169,8 +169,9 @@ static const struct of_device_id ep8248e_mdio_match[] = {static struct of_platform_driver ep8248e_mdio_driver = { .driver = { .name ="ep8248e-mdio-bitbang" , + .owner =THIS_MODULE , + .of_match_table = ep8248e_mdio_match, }, - .match_table = ep8248e_mdio_match, .probe = ep8248e_mdio_probe, .remove = ep8248e_mdio_remove, };
arch/powerpc/platforms/83xx/suspend.c +5 -2
@@ -423,8 +423,11 @@ static struct of_device_id pmc_match[] = { };static struct of_platform_driver pmc_driver = { - .name ="mpc83xx-pmc" , - .match_table = pmc_match, + .driver = { + .name ="mpc83xx-pmc" , + .owner =THIS_MODULE , + .of_match_table = pmc_match, + }, .probe = pmc_probe, .remove = pmc_remove };
arch/powerpc/platforms/cell/axon_msi.c +4 -3
@@ -446,11 +446,12 @@ static const struct of_device_id axon_msi_device_id[] = { };static struct of_platform_driver axon_msi_driver = { - .match_table = axon_msi_device_id, .probe = axon_msi_probe, .shutdown = axon_msi_shutdown, - .driver = { - .name ="axon-msi" + .driver = { + .name ="axon-msi" , + .owner =THIS_MODULE , + .of_match_table = axon_msi_device_id, }, };
arch/powerpc/platforms/pasemi/gpio_mdio.c +4 -3
@@ -300,11 +300,12 @@ MODULE_DEVICE_TABLE(of, gpio_mdio_match);static struct of_platform_driver gpio_mdio_driver = { - .match_table = gpio_mdio_match, .probe = gpio_mdio_probe, .remove = gpio_mdio_remove, - .driver = { - .name ="gpio-mdio-bitbang" , + .driver = { + .name ="gpio-mdio-bitbang" , + .owner =THIS_MODULE , + .of_match_table = gpio_mdio_match, }, };
arch/powerpc/sysdev/axonram.c +4 -4
@@ -327,12 +327,12 @@ static struct of_device_id axon_ram_device_id[] = { };static struct of_platform_driver axon_ram_driver = { - .match_table = axon_ram_device_id, .probe = axon_ram_probe, .remove = axon_ram_remove, - .driver = { - .owner =THIS_MODULE , - .name =AXON_RAM_MODULE_NAME , + .driver = { + .name =AXON_RAM_MODULE_NAME , + .owner =THIS_MODULE , + .of_match_table = axon_ram_device_id, }, };
arch/powerpc/sysdev/bestcomm/bestcomm.c +4 -6
@@ -494,14 +494,12 @@ MODULE_DEVICE_TABLE(of, mpc52xx_bcom_of_match);static struct of_platform_driver mpc52xx_bcom_of_platform_driver = { - .owner =THIS_MODULE , - .name =DRIVER_NAME , - .match_table = mpc52xx_bcom_of_match, .probe = mpc52xx_bcom_probe, .remove = mpc52xx_bcom_remove, - .driver = { - .name =DRIVER_NAME , - .owner =THIS_MODULE , + .driver = { + .name =DRIVER_NAME , + .owner =THIS_MODULE , + .of_match_table = mpc52xx_bcom_of_match, }, };
arch/powerpc/sysdev/fsl_msi.c +5 -2
@@ -344,8 +344,11 @@ static const struct of_device_id fsl_of_msi_ids[] = { };static struct of_platform_driver fsl_of_msi_driver = { - .name ="fsl-msi" , - .match_table = fsl_of_msi_ids, + .driver = { + .name ="fsl-msi" , + .owner =THIS_MODULE , + .of_match_table = fsl_of_msi_ids, + }, .probe = fsl_of_msi_probe, };
arch/powerpc/sysdev/fsl_pmc.c +5 -2
@@ -76,8 +76,11 @@ static const struct of_device_id pmc_ids[] = { };static struct of_platform_driver pmc_driver = { - .driver.name ="fsl-pmc" , - .match_table = pmc_ids, + .driver = { + .name ="fsl-pmc" , + .owner =THIS_MODULE , + .of_match_table = pmc_ids, + }, .probe = pmc_probe, };
arch/powerpc/sysdev/fsl_rio.c +5 -2
@@ -1214,8 +1214,11 @@ static const struct of_device_id fsl_of_rio_rpn_ids[] = { };static struct of_platform_driver fsl_of_rio_rpn_driver = { - .name ="fsl-of-rio" , - .match_table = fsl_of_rio_rpn_ids, + .driver = { + .name ="fsl-of-rio" , + .owner =THIS_MODULE , + .of_match_table = fsl_of_rio_rpn_ids, + }, .probe = fsl_of_rio_rpn_probe, };
arch/powerpc/sysdev/pmi.c +4 -3
@@ -205,11 +205,12 @@ static int pmi_of_remove(struct of_device *dev) }static struct of_platform_driver pmi_of_platform_driver = { - .match_table = pmi_match, .probe = pmi_of_probe, .remove = pmi_of_remove, - .driver = { - .name ="pmi" , + .driver = { + .name ="pmi" , + .owner =THIS_MODULE , + .of_match_table = pmi_match, }, };
arch/powerpc/sysdev/qe_lib/qe.c +5 -2
@@ -669,8 +669,11 @@ static const struct of_device_id qe_ids[] = { };static struct of_platform_driver qe_driver = { - .driver.name ="fsl-qe" , - .match_table = qe_ids, + .driver = { + .name ="fsl-qe" , + .owner =THIS_MODULE , + .of_match_table = qe_ids, + }, .probe = qe_probe, .resume = qe_resume, };
drivers/dma/fsldma.c +8 -5
@@ -1407,11 +1407,14 @@ static const struct of_device_id fsldma_of_ids[] = { {} }; -static struct of_platform_driver fsldma_of_driver = { - .name ="fsl-elo-dma" , - .match_table = fsldma_of_ids, - .probe = fsldma_of_probe, - .remove = fsldma_of_remove, +static struct of_platform_driver of_fsl_dma_driver = { + .driver = { + .name ="fsl-elo-dma" , + .owner =THIS_MODULE , + .of_match_table = fsldma_of_ids, + }, + .probe = fsldma_of_probe, + .remove = fsldma_of_remove, };/*----------------------------------------------------------------------------*/
drivers/dma/ppc4xx/adma.c +1 -1
@@ -4948,12 +4948,12 @@ static const struct of_device_id ppc440spe_adma_of_match[] __devinitconst = {MODULE_DEVICE_TABLE (of, ppc440spe_adma_of_match);static struct of_platform_driver ppc440spe_adma_driver = { - .match_table = ppc440spe_adma_of_match, .probe = ppc440spe_adma_probe, .remove =__devexit_p (ppc440spe_adma_remove), .driver = { .name ="PPC440SP(E)-ADMA" , .owner =THIS_MODULE , + .of_match_table = ppc440spe_adma_of_match, }, };
drivers/edac/mpc85xx_edac.c +12 -18
@@ -339,15 +339,13 @@ static struct of_device_id mpc85xx_pci_err_of_match[] = { };static struct of_platform_driver mpc85xx_pci_err_driver = { - .owner =THIS_MODULE , - .name ="mpc85xx_pci_err" , - .match_table = mpc85xx_pci_err_of_match, .probe = mpc85xx_pci_err_probe, .remove =__devexit_p (mpc85xx_pci_err_remove), .driver = { - .name ="mpc85xx_pci_err" , - .owner =THIS_MODULE , - }, + .name ="mpc85xx_pci_err" , + .owner =THIS_MODULE , + .of_match_table = mpc85xx_pci_err_of_match, + }, };#endif /* CONFIG_PCI */
@@ -655,15 +653,13 @@ static struct of_device_id mpc85xx_l2_err_of_match[] = { };static struct of_platform_driver mpc85xx_l2_err_driver = { - .owner =THIS_MODULE , - .name ="mpc85xx_l2_err" , - .match_table = mpc85xx_l2_err_of_match, .probe = mpc85xx_l2_err_probe, .remove = mpc85xx_l2_err_remove, .driver = { - .name ="mpc85xx_l2_err" , - .owner =THIS_MODULE , - }, + .name ="mpc85xx_l2_err" , + .owner =THIS_MODULE , + .of_match_table = mpc85xx_l2_err_of_match, + }, };/**************************** MC Err device ***************************/
@@ -992,15 +988,13 @@ static struct of_device_id mpc85xx_mc_err_of_match[] = { };static struct of_platform_driver mpc85xx_mc_err_driver = { - .owner =THIS_MODULE , - .name ="mpc85xx_mc_err" , - .match_table = mpc85xx_mc_err_of_match, .probe = mpc85xx_mc_err_probe, .remove = mpc85xx_mc_err_remove, .driver = { - .name ="mpc85xx_mc_err" , - .owner =THIS_MODULE , - }, + .name ="mpc85xx_mc_err" , + .owner =THIS_MODULE , + .of_match_table = mpc85xx_mc_err_of_match, + }, };#ifdef CONFIG_MPC85xx
drivers/edac/ppc4xx_edac.c +5 -5
@@ -202,13 +202,13 @@ static struct of_device_id ppc4xx_edac_match[] = { };static struct of_platform_driver ppc4xx_edac_driver = { - .match_table = ppc4xx_edac_match, .probe = ppc4xx_edac_probe, .remove = ppc4xx_edac_remove, - .driver = { - .owner =THIS_MODULE , - .name =PPC4XX_EDAC_MODULE_NAME - } + .driver = { + .owner =THIS_MODULE , + .name =PPC4XX_EDAC_MODULE_NAME + .of_match_table = ppc4xx_edac_match, + }, };/*
PATCH 25/27 arch/powerpc/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.
---
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 ++++-- drivers/dma/fsldma.c | 13 +++++++---- drivers/dma/ppc4xx/adma.c | 2 +- drivers/edac/mpc85xx_edac.c | 30 ++++++++++--------------- drivers/edac/ppc4xx_edac.c | 10 ++++---- 19 files changed, 95 insertions(+), 69 deletions(-)
arch/powerpc/kernel/of_platform.c +2 -1
@@ -307,10 +307,11 @@ static struct of_device_id of_pci_phb_ids[] = { };static struct of_platform_driver of_pci_phb_driver = { - .match_table = of_pci_phb_ids, .probe = of_pci_phb_probe, .driver = { .name ="of-pci" , + .owner =THIS_MODULE , + .of_match_table = of_pci_phb_ids, }, };
arch/powerpc/platforms/52xx/mpc52xx_gpio.c +10 -4
@@ -192,8 +192,11 @@ static const struct of_device_id mpc52xx_wkup_gpiochip_match[] = { };static struct of_platform_driver mpc52xx_wkup_gpiochip_driver = { - .name ="gpio_wkup" , - .match_table = mpc52xx_wkup_gpiochip_match, + .driver = { + .name ="gpio_wkup" , + .owner =THIS_MODULE , + .of_match_table = mpc52xx_wkup_gpiochip_match, + }, .probe = mpc52xx_wkup_gpiochip_probe, .remove = mpc52xx_gpiochip_remove, };
@@ -348,8 +351,11 @@ static const struct of_device_id mpc52xx_simple_gpiochip_match[] = { };static struct of_platform_driver mpc52xx_simple_gpiochip_driver = { - .name ="gpio" , - .match_table = mpc52xx_simple_gpiochip_match, + .driver = { + .name ="gpio" , + .owner =THIS_MODULE , + .of_match_table = mpc52xx_simple_gpiochip_match, + }, .probe = mpc52xx_simple_gpiochip_probe, .remove = mpc52xx_gpiochip_remove, };
arch/powerpc/platforms/52xx/mpc52xx_gpt.c +5 -2
@@ -779,8 +779,11 @@ static const struct of_device_id mpc52xx_gpt_match[] = { };static struct of_platform_driver mpc52xx_gpt_driver = { - .name ="mpc52xx-gpt" , - .match_table = mpc52xx_gpt_match, + .driver = { + .name ="mpc52xx-gpt" , + .owner =THIS_MODULE , + .of_match_table = mpc52xx_gpt_match, + }, .probe = mpc52xx_gpt_probe, .remove = mpc52xx_gpt_remove, };
arch/powerpc/platforms/52xx/mpc52xx_lpbfifo.c +5 -3
@@ -535,9 +535,11 @@ static struct of_device_id mpc52xx_lpbfifo_match[] __devinitconst = { };static struct of_platform_driver mpc52xx_lpbfifo_driver = { - .owner =THIS_MODULE , - .name ="mpc52xx-lpbfifo" , - .match_table = mpc52xx_lpbfifo_match, + .driver = { + .name ="mpc52xx-lpbfifo" , + .owner =THIS_MODULE , + .of_match_table = mpc52xx_lpbfifo_match, + }, .probe = mpc52xx_lpbfifo_probe, .remove =__devexit_p (mpc52xx_lpbfifo_remove), };
arch/powerpc/platforms/82xx/ep8248e.c +2 -1
@@ -169,8 +169,9 @@ static const struct of_device_id ep8248e_mdio_match[] = {static struct of_platform_driver ep8248e_mdio_driver = { .driver = { .name ="ep8248e-mdio-bitbang" , + .owner =THIS_MODULE , + .of_match_table = ep8248e_mdio_match, }, - .match_table = ep8248e_mdio_match, .probe = ep8248e_mdio_probe, .remove = ep8248e_mdio_remove, };
arch/powerpc/platforms/83xx/suspend.c +5 -2
@@ -423,8 +423,11 @@ static struct of_device_id pmc_match[] = { };static struct of_platform_driver pmc_driver = { - .name ="mpc83xx-pmc" , - .match_table = pmc_match, + .driver = { + .name ="mpc83xx-pmc" , + .owner =THIS_MODULE , + .of_match_table = pmc_match, + }, .probe = pmc_probe, .remove = pmc_remove };
arch/powerpc/platforms/cell/axon_msi.c +4 -3
@@ -446,11 +446,12 @@ static const struct of_device_id axon_msi_device_id[] = { };static struct of_platform_driver axon_msi_driver = { - .match_table = axon_msi_device_id, .probe = axon_msi_probe, .shutdown = axon_msi_shutdown, - .driver = { - .name ="axon-msi" + .driver = { + .name ="axon-msi" , + .owner =THIS_MODULE , + .of_match_table = axon_msi_device_id, }, };
arch/powerpc/platforms/pasemi/gpio_mdio.c +4 -3
@@ -300,11 +300,12 @@ MODULE_DEVICE_TABLE(of, gpio_mdio_match);static struct of_platform_driver gpio_mdio_driver = { - .match_table = gpio_mdio_match, .probe = gpio_mdio_probe, .remove = gpio_mdio_remove, - .driver = { - .name ="gpio-mdio-bitbang" , + .driver = { + .name ="gpio-mdio-bitbang" , + .owner =THIS_MODULE , + .of_match_table = gpio_mdio_match, }, };
arch/powerpc/sysdev/axonram.c +4 -4
@@ -327,12 +327,12 @@ static struct of_device_id axon_ram_device_id[] = { };static struct of_platform_driver axon_ram_driver = { - .match_table = axon_ram_device_id, .probe = axon_ram_probe, .remove = axon_ram_remove, - .driver = { - .owner =THIS_MODULE , - .name =AXON_RAM_MODULE_NAME , + .driver = { + .name =AXON_RAM_MODULE_NAME , + .owner =THIS_MODULE , + .of_match_table = axon_ram_device_id, }, };
arch/powerpc/sysdev/bestcomm/bestcomm.c +4 -6
@@ -494,14 +494,12 @@ MODULE_DEVICE_TABLE(of, mpc52xx_bcom_of_match);static struct of_platform_driver mpc52xx_bcom_of_platform_driver = { - .owner =THIS_MODULE , - .name =DRIVER_NAME , - .match_table = mpc52xx_bcom_of_match, .probe = mpc52xx_bcom_probe, .remove = mpc52xx_bcom_remove, - .driver = { - .name =DRIVER_NAME , - .owner =THIS_MODULE , + .driver = { + .name =DRIVER_NAME , + .owner =THIS_MODULE , + .of_match_table = mpc52xx_bcom_of_match, }, };
arch/powerpc/sysdev/fsl_msi.c +5 -2
@@ -344,8 +344,11 @@ static const struct of_device_id fsl_of_msi_ids[] = { };static struct of_platform_driver fsl_of_msi_driver = { - .name ="fsl-msi" , - .match_table = fsl_of_msi_ids, + .driver = { + .name ="fsl-msi" , + .owner =THIS_MODULE , + .of_match_table = fsl_of_msi_ids, + }, .probe = fsl_of_msi_probe, };
arch/powerpc/sysdev/fsl_pmc.c +5 -2
@@ -76,8 +76,11 @@ static const struct of_device_id pmc_ids[] = { };static struct of_platform_driver pmc_driver = { - .driver.name ="fsl-pmc" , - .match_table = pmc_ids, + .driver = { + .name ="fsl-pmc" , + .owner =THIS_MODULE , + .of_match_table = pmc_ids, + }, .probe = pmc_probe, };
arch/powerpc/sysdev/fsl_rio.c +5 -2
@@ -1214,8 +1214,11 @@ static const struct of_device_id fsl_of_rio_rpn_ids[] = { };static struct of_platform_driver fsl_of_rio_rpn_driver = { - .name ="fsl-of-rio" , - .match_table = fsl_of_rio_rpn_ids, + .driver = { + .name ="fsl-of-rio" , + .owner =THIS_MODULE , + .of_match_table = fsl_of_rio_rpn_ids, + }, .probe = fsl_of_rio_rpn_probe, };
arch/powerpc/sysdev/pmi.c +4 -3
@@ -205,11 +205,12 @@ static int pmi_of_remove(struct of_device *dev) }static struct of_platform_driver pmi_of_platform_driver = { - .match_table = pmi_match, .probe = pmi_of_probe, .remove = pmi_of_remove, - .driver = { - .name ="pmi" , + .driver = { + .name ="pmi" , + .owner =THIS_MODULE , + .of_match_table = pmi_match, }, };
arch/powerpc/sysdev/qe_lib/qe.c +5 -2
@@ -669,8 +669,11 @@ static const struct of_device_id qe_ids[] = { };static struct of_platform_driver qe_driver = { - .driver.name ="fsl-qe" , - .match_table = qe_ids, + .driver = { + .name ="fsl-qe" , + .owner =THIS_MODULE , + .of_match_table = qe_ids, + }, .probe = qe_probe, .resume = qe_resume, };
drivers/dma/fsldma.c +8 -5
@@ -1407,11 +1407,14 @@ static const struct of_device_id fsldma_of_ids[] = { {} }; -static struct of_platform_driver fsldma_of_driver = { - .name ="fsl-elo-dma" , - .match_table = fsldma_of_ids, - .probe = fsldma_of_probe, - .remove = fsldma_of_remove, +static struct of_platform_driver of_fsl_dma_driver = { + .driver = { + .name ="fsl-elo-dma" , + .owner =THIS_MODULE , + .of_match_table = fsldma_of_ids, + }, + .probe = fsldma_of_probe, + .remove = fsldma_of_remove, };/*----------------------------------------------------------------------------*/
drivers/dma/ppc4xx/adma.c +1 -1
@@ -4948,12 +4948,12 @@ static const struct of_device_id ppc440spe_adma_of_match[] __devinitconst = {MODULE_DEVICE_TABLE (of, ppc440spe_adma_of_match);static struct of_platform_driver ppc440spe_adma_driver = { - .match_table = ppc440spe_adma_of_match, .probe = ppc440spe_adma_probe, .remove =__devexit_p (ppc440spe_adma_remove), .driver = { .name ="PPC440SP(E)-ADMA" , .owner =THIS_MODULE , + .of_match_table = ppc440spe_adma_of_match, }, };
drivers/edac/mpc85xx_edac.c +12 -18
@@ -339,15 +339,13 @@ static struct of_device_id mpc85xx_pci_err_of_match[] = { };static struct of_platform_driver mpc85xx_pci_err_driver = { - .owner =THIS_MODULE , - .name ="mpc85xx_pci_err" , - .match_table = mpc85xx_pci_err_of_match, .probe = mpc85xx_pci_err_probe, .remove =__devexit_p (mpc85xx_pci_err_remove), .driver = { - .name ="mpc85xx_pci_err" , - .owner =THIS_MODULE , - }, + .name ="mpc85xx_pci_err" , + .owner =THIS_MODULE , + .of_match_table = mpc85xx_pci_err_of_match, + }, };#endif /* CONFIG_PCI */
@@ -655,15 +653,13 @@ static struct of_device_id mpc85xx_l2_err_of_match[] = { };static struct of_platform_driver mpc85xx_l2_err_driver = { - .owner =THIS_MODULE , - .name ="mpc85xx_l2_err" , - .match_table = mpc85xx_l2_err_of_match, .probe = mpc85xx_l2_err_probe, .remove = mpc85xx_l2_err_remove, .driver = { - .name ="mpc85xx_l2_err" , - .owner =THIS_MODULE , - }, + .name ="mpc85xx_l2_err" , + .owner =THIS_MODULE , + .of_match_table = mpc85xx_l2_err_of_match, + }, };/**************************** MC Err device ***************************/
@@ -992,15 +988,13 @@ static struct of_device_id mpc85xx_mc_err_of_match[] = { };static struct of_platform_driver mpc85xx_mc_err_driver = { - .owner =THIS_MODULE , - .name ="mpc85xx_mc_err" , - .match_table = mpc85xx_mc_err_of_match, .probe = mpc85xx_mc_err_probe, .remove = mpc85xx_mc_err_remove, .driver = { - .name ="mpc85xx_mc_err" , - .owner =THIS_MODULE , - }, + .name ="mpc85xx_mc_err" , + .owner =THIS_MODULE , + .of_match_table = mpc85xx_mc_err_of_match, + }, };#ifdef CONFIG_MPC85xx
drivers/edac/ppc4xx_edac.c +5 -5
@@ -202,13 +202,13 @@ static struct of_device_id ppc4xx_edac_match[] = { };static struct of_platform_driver ppc4xx_edac_driver = { - .match_table = ppc4xx_edac_match, .probe = ppc4xx_edac_probe, .remove = ppc4xx_edac_remove, - .driver = { - .owner =THIS_MODULE , - .name =PPC4XX_EDAC_MODULE_NAME - } + .driver = { + .owner =THIS_MODULE , + .name =PPC4XX_EDAC_MODULE_NAME + .of_match_table = ppc4xx_edac_match, + }, };/*
PATCH 25/27 arch/powerpc/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.
---
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 ++++-- drivers/dma/fsldma.c | 13 +++++++---- drivers/dma/ppc4xx/adma.c | 2 +- drivers/edac/mpc85xx_edac.c | 30 ++++++++++--------------- drivers/edac/ppc4xx_edac.c | 10 ++++---- 19 files changed, 95 insertions(+), 69 deletions(-)
arch/powerpc/kernel/of_platform.c +2 -1
@@ -307,10 +307,11 @@ static struct of_device_id of_pci_phb_ids[] = { };static struct of_platform_driver of_pci_phb_driver = { - .match_table = of_pci_phb_ids, .probe = of_pci_phb_probe, .driver = { .name ="of-pci" , + .owner =THIS_MODULE , + .of_match_table = of_pci_phb_ids, }, };
arch/powerpc/platforms/52xx/mpc52xx_gpio.c +10 -4
@@ -192,8 +192,11 @@ static const struct of_device_id mpc52xx_wkup_gpiochip_match[] = { };static struct of_platform_driver mpc52xx_wkup_gpiochip_driver = { - .name ="gpio_wkup" , - .match_table = mpc52xx_wkup_gpiochip_match, + .driver = { + .name ="gpio_wkup" , + .owner =THIS_MODULE , + .of_match_table = mpc52xx_wkup_gpiochip_match, + }, .probe = mpc52xx_wkup_gpiochip_probe, .remove = mpc52xx_gpiochip_remove, };
@@ -348,8 +351,11 @@ static const struct of_device_id mpc52xx_simple_gpiochip_match[] = { };static struct of_platform_driver mpc52xx_simple_gpiochip_driver = { - .name ="gpio" , - .match_table = mpc52xx_simple_gpiochip_match, + .driver = { + .name ="gpio" , + .owner =THIS_MODULE , + .of_match_table = mpc52xx_simple_gpiochip_match, + }, .probe = mpc52xx_simple_gpiochip_probe, .remove = mpc52xx_gpiochip_remove, };
arch/powerpc/platforms/52xx/mpc52xx_gpt.c +5 -2
@@ -779,8 +779,11 @@ static const struct of_device_id mpc52xx_gpt_match[] = { };static struct of_platform_driver mpc52xx_gpt_driver = { - .name ="mpc52xx-gpt" , - .match_table = mpc52xx_gpt_match, + .driver = { + .name ="mpc52xx-gpt" , + .owner =THIS_MODULE , + .of_match_table = mpc52xx_gpt_match, + }, .probe = mpc52xx_gpt_probe, .remove = mpc52xx_gpt_remove, };
arch/powerpc/platforms/52xx/mpc52xx_lpbfifo.c +5 -3
@@ -535,9 +535,11 @@ static struct of_device_id mpc52xx_lpbfifo_match[] __devinitconst = { };static struct of_platform_driver mpc52xx_lpbfifo_driver = { - .owner =THIS_MODULE , - .name ="mpc52xx-lpbfifo" , - .match_table = mpc52xx_lpbfifo_match, + .driver = { + .name ="mpc52xx-lpbfifo" , + .owner =THIS_MODULE , + .of_match_table = mpc52xx_lpbfifo_match, + }, .probe = mpc52xx_lpbfifo_probe, .remove =__devexit_p (mpc52xx_lpbfifo_remove), };
arch/powerpc/platforms/82xx/ep8248e.c +2 -1
@@ -169,8 +169,9 @@ static const struct of_device_id ep8248e_mdio_match[] = {static struct of_platform_driver ep8248e_mdio_driver = { .driver = { .name ="ep8248e-mdio-bitbang" , + .owner =THIS_MODULE , + .of_match_table = ep8248e_mdio_match, }, - .match_table = ep8248e_mdio_match, .probe = ep8248e_mdio_probe, .remove = ep8248e_mdio_remove, };
arch/powerpc/platforms/83xx/suspend.c +5 -2
@@ -423,8 +423,11 @@ static struct of_device_id pmc_match[] = { };static struct of_platform_driver pmc_driver = { - .name ="mpc83xx-pmc" , - .match_table = pmc_match, + .driver = { + .name ="mpc83xx-pmc" , + .owner =THIS_MODULE , + .of_match_table = pmc_match, + }, .probe = pmc_probe, .remove = pmc_remove };
arch/powerpc/platforms/cell/axon_msi.c +4 -3
@@ -446,11 +446,12 @@ static const struct of_device_id axon_msi_device_id[] = { };static struct of_platform_driver axon_msi_driver = { - .match_table = axon_msi_device_id, .probe = axon_msi_probe, .shutdown = axon_msi_shutdown, - .driver = { - .name ="axon-msi" + .driver = { + .name ="axon-msi" , + .owner =THIS_MODULE , + .of_match_table = axon_msi_device_id, }, };
arch/powerpc/platforms/pasemi/gpio_mdio.c +4 -3
@@ -300,11 +300,12 @@ MODULE_DEVICE_TABLE(of, gpio_mdio_match);static struct of_platform_driver gpio_mdio_driver = { - .match_table = gpio_mdio_match, .probe = gpio_mdio_probe, .remove = gpio_mdio_remove, - .driver = { - .name ="gpio-mdio-bitbang" , + .driver = { + .name ="gpio-mdio-bitbang" , + .owner =THIS_MODULE , + .of_match_table = gpio_mdio_match, }, };
arch/powerpc/sysdev/axonram.c +4 -4
@@ -327,12 +327,12 @@ static struct of_device_id axon_ram_device_id[] = { };static struct of_platform_driver axon_ram_driver = { - .match_table = axon_ram_device_id, .probe = axon_ram_probe, .remove = axon_ram_remove, - .driver = { - .owner =THIS_MODULE , - .name =AXON_RAM_MODULE_NAME , + .driver = { + .name =AXON_RAM_MODULE_NAME , + .owner =THIS_MODULE , + .of_match_table = axon_ram_device_id, }, };
arch/powerpc/sysdev/bestcomm/bestcomm.c +4 -6
@@ -494,14 +494,12 @@ MODULE_DEVICE_TABLE(of, mpc52xx_bcom_of_match);static struct of_platform_driver mpc52xx_bcom_of_platform_driver = { - .owner =THIS_MODULE , - .name =DRIVER_NAME , - .match_table = mpc52xx_bcom_of_match, .probe = mpc52xx_bcom_probe, .remove = mpc52xx_bcom_remove, - .driver = { - .name =DRIVER_NAME , - .owner =THIS_MODULE , + .driver = { + .name =DRIVER_NAME , + .owner =THIS_MODULE , + .of_match_table = mpc52xx_bcom_of_match, }, };
arch/powerpc/sysdev/fsl_msi.c +5 -2
@@ -344,8 +344,11 @@ static const struct of_device_id fsl_of_msi_ids[] = { };static struct of_platform_driver fsl_of_msi_driver = { - .name ="fsl-msi" , - .match_table = fsl_of_msi_ids, + .driver = { + .name ="fsl-msi" , + .owner =THIS_MODULE , + .of_match_table = fsl_of_msi_ids, + }, .probe = fsl_of_msi_probe, };
arch/powerpc/sysdev/fsl_pmc.c +5 -2
@@ -76,8 +76,11 @@ static const struct of_device_id pmc_ids[] = { };static struct of_platform_driver pmc_driver = { - .driver.name ="fsl-pmc" , - .match_table = pmc_ids, + .driver = { + .name ="fsl-pmc" , + .owner =THIS_MODULE , + .of_match_table = pmc_ids, + }, .probe = pmc_probe, };
arch/powerpc/sysdev/fsl_rio.c +5 -2
@@ -1214,8 +1214,11 @@ static const struct of_device_id fsl_of_rio_rpn_ids[] = { };static struct of_platform_driver fsl_of_rio_rpn_driver = { - .name ="fsl-of-rio" , - .match_table = fsl_of_rio_rpn_ids, + .driver = { + .name ="fsl-of-rio" , + .owner =THIS_MODULE , + .of_match_table = fsl_of_rio_rpn_ids, + }, .probe = fsl_of_rio_rpn_probe, };
arch/powerpc/sysdev/pmi.c +4 -3
@@ -205,11 +205,12 @@ static int pmi_of_remove(struct of_device *dev) }static struct of_platform_driver pmi_of_platform_driver = { - .match_table = pmi_match, .probe = pmi_of_probe, .remove = pmi_of_remove, - .driver = { - .name ="pmi" , + .driver = { + .name ="pmi" , + .owner =THIS_MODULE , + .of_match_table = pmi_match, }, };
arch/powerpc/sysdev/qe_lib/qe.c +5 -2
@@ -669,8 +669,11 @@ static const struct of_device_id qe_ids[] = { };static struct of_platform_driver qe_driver = { - .driver.name ="fsl-qe" , - .match_table = qe_ids, + .driver = { + .name ="fsl-qe" , + .owner =THIS_MODULE , + .of_match_table = qe_ids, + }, .probe = qe_probe, .resume = qe_resume, };
drivers/dma/fsldma.c +8 -5
@@ -1407,11 +1407,14 @@ static const struct of_device_id fsldma_of_ids[] = { {} }; -static struct of_platform_driver fsldma_of_driver = { - .name ="fsl-elo-dma" , - .match_table = fsldma_of_ids, - .probe = fsldma_of_probe, - .remove = fsldma_of_remove, +static struct of_platform_driver of_fsl_dma_driver = { + .driver = { + .name ="fsl-elo-dma" , + .owner =THIS_MODULE , + .of_match_table = fsldma_of_ids, + }, + .probe = fsldma_of_probe, + .remove = fsldma_of_remove, };/*----------------------------------------------------------------------------*/
drivers/dma/ppc4xx/adma.c +1 -1
@@ -4948,12 +4948,12 @@ static const struct of_device_id ppc440spe_adma_of_match[] __devinitconst = {MODULE_DEVICE_TABLE (of, ppc440spe_adma_of_match);static struct of_platform_driver ppc440spe_adma_driver = { - .match_table = ppc440spe_adma_of_match, .probe = ppc440spe_adma_probe, .remove =__devexit_p (ppc440spe_adma_remove), .driver = { .name ="PPC440SP(E)-ADMA" , .owner =THIS_MODULE , + .of_match_table = ppc440spe_adma_of_match, }, };
drivers/edac/mpc85xx_edac.c +12 -18
@@ -339,15 +339,13 @@ static struct of_device_id mpc85xx_pci_err_of_match[] = { };static struct of_platform_driver mpc85xx_pci_err_driver = { - .owner =THIS_MODULE , - .name ="mpc85xx_pci_err" , - .match_table = mpc85xx_pci_err_of_match, .probe = mpc85xx_pci_err_probe, .remove =__devexit_p (mpc85xx_pci_err_remove), .driver = { - .name ="mpc85xx_pci_err" , - .owner =THIS_MODULE , - }, + .name ="mpc85xx_pci_err" , + .owner =THIS_MODULE , + .of_match_table = mpc85xx_pci_err_of_match, + }, };#endif /* CONFIG_PCI */
@@ -655,15 +653,13 @@ static struct of_device_id mpc85xx_l2_err_of_match[] = { };static struct of_platform_driver mpc85xx_l2_err_driver = { - .owner =THIS_MODULE , - .name ="mpc85xx_l2_err" , - .match_table = mpc85xx_l2_err_of_match, .probe = mpc85xx_l2_err_probe, .remove = mpc85xx_l2_err_remove, .driver = { - .name ="mpc85xx_l2_err" , - .owner =THIS_MODULE , - }, + .name ="mpc85xx_l2_err" , + .owner =THIS_MODULE , + .of_match_table = mpc85xx_l2_err_of_match, + }, };/**************************** MC Err device ***************************/
@@ -992,15 +988,13 @@ static struct of_device_id mpc85xx_mc_err_of_match[] = { };static struct of_platform_driver mpc85xx_mc_err_driver = { - .owner =THIS_MODULE , - .name ="mpc85xx_mc_err" , - .match_table = mpc85xx_mc_err_of_match, .probe = mpc85xx_mc_err_probe, .remove = mpc85xx_mc_err_remove, .driver = { - .name ="mpc85xx_mc_err" , - .owner =THIS_MODULE , - }, + .name ="mpc85xx_mc_err" , + .owner =THIS_MODULE , + .of_match_table = mpc85xx_mc_err_of_match, + }, };#ifdef CONFIG_MPC85xx
drivers/edac/ppc4xx_edac.c +5 -5
@@ -202,13 +202,13 @@ static struct of_device_id ppc4xx_edac_match[] = { };static struct of_platform_driver ppc4xx_edac_driver = { - .match_table = ppc4xx_edac_match, .probe = ppc4xx_edac_probe, .remove = ppc4xx_edac_remove, - .driver = { - .owner =THIS_MODULE , - .name =PPC4XX_EDAC_MODULE_NAME - } + .driver = { + .owner =THIS_MODULE , + .name =PPC4XX_EDAC_MODULE_NAME + .of_match_table = ppc4xx_edac_match, + }, };/*
PATCH 26/27 arch/sparc/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.
---
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 ++++++++++++--------- 14 files changed, 77 insertions(+), 42 deletions(-)
arch/sparc/include/asm/parport.h +5 -2
@@ -232,8 +232,11 @@ static const struct of_device_id ecpp_match[] = { };static struct of_platform_driver ecpp_driver = { - .name ="ecpp" , - .match_table = ecpp_match, + .driver = { + .name ="ecpp" , + .owner =THIS_MODULE , + .of_match_table = ecpp_match, + }, .probe = ecpp_probe, .remove =__devexit_p (ecpp_remove), };
arch/sparc/kernel/apc.c +5 -2
@@ -174,8 +174,11 @@ static struct of_device_id __initdata apc_match[] = {MODULE_DEVICE_TABLE (of, apc_match);static struct of_platform_driver apc_driver = { - .name ="apc" , - .match_table = apc_match, + .driver = { + .name ="apc" , + .owner =THIS_MODULE , + .of_match_table = apc_match, + }, .probe = apc_probe, };
arch/sparc/kernel/auxio_64.c +4 -3
@@ -132,10 +132,11 @@ static int __devinit auxio_probe(struct of_device *dev, const struct of_device_i }static struct of_platform_driver auxio_driver = { - .match_table = auxio_match, .probe = auxio_probe, - .driver = { - .name ="auxio" , + .driver = { + .name ="auxio" , + .owner =THIS_MODULE , + .of_match_table = auxio_match, }, };
arch/sparc/kernel/central.c +8 -6
@@ -148,10 +148,11 @@ static struct of_device_id __initdata clock_board_match[] = { };static struct of_platform_driver clock_board_driver = { - .match_table = clock_board_match, .probe = clock_board_probe, - .driver = { - .name ="clock_board" , + .driver = { + .name ="clock_board" , + .owner =THIS_MODULE , + .of_match_table = clock_board_match, }, };
@@ -253,10 +254,11 @@ static struct of_device_id __initdata fhc_match[] = { };static struct of_platform_driver fhc_driver = { - .match_table = fhc_match, .probe = fhc_probe, - .driver = { - .name ="fhc" , + .driver = { + .name ="fhc" , + .owner =THIS_MODULE , + .of_match_table = fhc_match, }, };
arch/sparc/kernel/chmc.c +5 -2
@@ -811,8 +811,11 @@ static const struct of_device_id us3mc_match[] = {MODULE_DEVICE_TABLE (of, us3mc_match);static struct of_platform_driver us3mc_driver = { - .name ="us3mc" , - .match_table = us3mc_match, + .driver = { + .name ="us3mc" , + .owner =THIS_MODULE , + .of_match_table = us3mc_match, + }, .probe = us3mc_probe, .remove =__devexit_p (us3mc_remove), };
arch/sparc/kernel/pci_fire.c +5 -2
@@ -508,8 +508,11 @@ static struct of_device_id __initdata fire_match[] = { };static struct of_platform_driver fire_driver = { - .name =DRIVER_NAME , - .match_table = fire_match, + .driver = { + .name =DRIVER_NAME , + .owner =THIS_MODULE , + .of_match_table = fire_match, + }, .probe = fire_probe, };
arch/sparc/kernel/pci_psycho.c +5 -2
@@ -602,8 +602,11 @@ static struct of_device_id __initdata psycho_match[] = { };static struct of_platform_driver psycho_driver = { - .name =DRIVER_NAME , - .match_table = psycho_match, + .driver = { + .name =DRIVER_NAME , + .owner =THIS_MODULE , + .of_match_table = psycho_match, + }, .probe = psycho_probe, };
arch/sparc/kernel/pci_sabre.c +5 -2
@@ -596,8 +596,11 @@ static struct of_device_id __initdata sabre_match[] = { };static struct of_platform_driver sabre_driver = { - .name =DRIVER_NAME , - .match_table = sabre_match, + .driver = { + .name =DRIVER_NAME , + .owner =THIS_MODULE , + .of_match_table = sabre_match, + }, .probe = sabre_probe, };
arch/sparc/kernel/pci_schizo.c +5 -2
@@ -1491,8 +1491,11 @@ static struct of_device_id __initdata schizo_match[] = { };static struct of_platform_driver schizo_driver = { - .name =DRIVER_NAME , - .match_table = schizo_match, + .driver = { + .name =DRIVER_NAME , + .owner =THIS_MODULE , + .of_match_table = schizo_match, + }, .probe = schizo_probe, };
arch/sparc/kernel/pci_sun4v.c +5 -2
@@ -1009,8 +1009,11 @@ static struct of_device_id __initdata pci_sun4v_match[] = { };static struct of_platform_driver pci_sun4v_driver = { - .name =DRIVER_NAME , - .match_table = pci_sun4v_match, + .driver = { + .name =DRIVER_NAME , + .owner =THIS_MODULE , + .of_match_table = pci_sun4v_match, + }, .probe = pci_sun4v_probe, };
arch/sparc/kernel/pmc.c +5 -2
@@ -79,8 +79,11 @@ static struct of_device_id __initdata pmc_match[] = {MODULE_DEVICE_TABLE (of, pmc_match);static struct of_platform_driver pmc_driver = { - .name ="pmc" , - .match_table = pmc_match, + .driver = { + .name ="pmc" , + .owner =THIS_MODULE , + .of_match_table = pmc_match, + }, .probe = pmc_probe, };
arch/sparc/kernel/power.c +4 -3
@@ -60,10 +60,11 @@ static struct of_device_id __initdata power_match[] = { };static struct of_platform_driver power_driver = { - .match_table = power_match, .probe = power_probe, - .driver = { - .name ="power" , + .driver = { + .name ="power" , + .owner =THIS_MODULE , + .of_match_table = power_match, }, };
arch/sparc/kernel/time_32.c +4 -3
@@ -185,10 +185,11 @@ static struct of_device_id __initdata clock_match[] = { };static struct of_platform_driver clock_driver = { - .match_table = clock_match, .probe = clock_probe, - .driver = { - .name ="rtc" , + .driver = { + .name ="rtc" , + .owner =THIS_MODULE , + .of_match_table = clock_match, }, };
arch/sparc/kernel/time_64.c +12 -9
@@ -462,10 +462,11 @@ static struct of_device_id __initdata rtc_match[] = { };static struct of_platform_driver rtc_driver = { - .match_table = rtc_match, .probe = rtc_probe, - .driver = { - .name ="rtc" , + .driver = { + .name ="rtc" , + .owner =THIS_MODULE , + .of_match_table = rtc_match, }, };
@@ -494,10 +495,11 @@ static struct of_device_id __initdata bq4802_match[] = { };static struct of_platform_driver bq4802_driver = { - .match_table = bq4802_match, .probe = bq4802_probe, - .driver = { - .name ="bq4802" , + .driver = { + .name ="bq4802" , + .owner =THIS_MODULE , + .of_match_table = bq4802_match, }, };
@@ -557,10 +559,11 @@ static struct of_device_id __initdata mostek_match[] = { };static struct of_platform_driver mostek_driver = { - .match_table = mostek_match, .probe = mostek_probe, - .driver = { - .name ="mostek" , + .driver = { + .name ="mostek" , + .owner =THIS_MODULE , + .of_match_table = mostek_match, }, };
PATCH 26/27 arch/sparc/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.
---
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 ++++++++++++--------- 14 files changed, 77 insertions(+), 42 deletions(-)
arch/sparc/include/asm/parport.h +5 -2
@@ -232,8 +232,11 @@ static const struct of_device_id ecpp_match[] = { };static struct of_platform_driver ecpp_driver = { - .name ="ecpp" , - .match_table = ecpp_match, + .driver = { + .name ="ecpp" , + .owner =THIS_MODULE , + .of_match_table = ecpp_match, + }, .probe = ecpp_probe, .remove =__devexit_p (ecpp_remove), };
arch/sparc/kernel/apc.c +5 -2
@@ -174,8 +174,11 @@ static struct of_device_id __initdata apc_match[] = {MODULE_DEVICE_TABLE (of, apc_match);static struct of_platform_driver apc_driver = { - .name ="apc" , - .match_table = apc_match, + .driver = { + .name ="apc" , + .owner =THIS_MODULE , + .of_match_table = apc_match, + }, .probe = apc_probe, };
arch/sparc/kernel/auxio_64.c +4 -3
@@ -132,10 +132,11 @@ static int __devinit auxio_probe(struct of_device *dev, const struct of_device_i }static struct of_platform_driver auxio_driver = { - .match_table = auxio_match, .probe = auxio_probe, - .driver = { - .name ="auxio" , + .driver = { + .name ="auxio" , + .owner =THIS_MODULE , + .of_match_table = auxio_match, }, };
arch/sparc/kernel/central.c +8 -6
@@ -148,10 +148,11 @@ static struct of_device_id __initdata clock_board_match[] = { };static struct of_platform_driver clock_board_driver = { - .match_table = clock_board_match, .probe = clock_board_probe, - .driver = { - .name ="clock_board" , + .driver = { + .name ="clock_board" , + .owner =THIS_MODULE , + .of_match_table = clock_board_match, }, };
@@ -253,10 +254,11 @@ static struct of_device_id __initdata fhc_match[] = { };static struct of_platform_driver fhc_driver = { - .match_table = fhc_match, .probe = fhc_probe, - .driver = { - .name ="fhc" , + .driver = { + .name ="fhc" , + .owner =THIS_MODULE , + .of_match_table = fhc_match, }, };
arch/sparc/kernel/chmc.c +5 -2
@@ -811,8 +811,11 @@ static const struct of_device_id us3mc_match[] = {MODULE_DEVICE_TABLE (of, us3mc_match);static struct of_platform_driver us3mc_driver = { - .name ="us3mc" , - .match_table = us3mc_match, + .driver = { + .name ="us3mc" , + .owner =THIS_MODULE , + .of_match_table = us3mc_match, + }, .probe = us3mc_probe, .remove =__devexit_p (us3mc_remove), };
arch/sparc/kernel/pci_fire.c +5 -2
@@ -508,8 +508,11 @@ static struct of_device_id __initdata fire_match[] = { };static struct of_platform_driver fire_driver = { - .name =DRIVER_NAME , - .match_table = fire_match, + .driver = { + .name =DRIVER_NAME , + .owner =THIS_MODULE , + .of_match_table = fire_match, + }, .probe = fire_probe, };
arch/sparc/kernel/pci_psycho.c +5 -2
@@ -602,8 +602,11 @@ static struct of_device_id __initdata psycho_match[] = { };static struct of_platform_driver psycho_driver = { - .name =DRIVER_NAME , - .match_table = psycho_match, + .driver = { + .name =DRIVER_NAME , + .owner =THIS_MODULE , + .of_match_table = psycho_match, + }, .probe = psycho_probe, };
arch/sparc/kernel/pci_sabre.c +5 -2
@@ -596,8 +596,11 @@ static struct of_device_id __initdata sabre_match[] = { };static struct of_platform_driver sabre_driver = { - .name =DRIVER_NAME , - .match_table = sabre_match, + .driver = { + .name =DRIVER_NAME , + .owner =THIS_MODULE , + .of_match_table = sabre_match, + }, .probe = sabre_probe, };
arch/sparc/kernel/pci_schizo.c +5 -2
@@ -1491,8 +1491,11 @@ static struct of_device_id __initdata schizo_match[] = { };static struct of_platform_driver schizo_driver = { - .name =DRIVER_NAME , - .match_table = schizo_match, + .driver = { + .name =DRIVER_NAME , + .owner =THIS_MODULE , + .of_match_table = schizo_match, + }, .probe = schizo_probe, };
arch/sparc/kernel/pci_sun4v.c +5 -2
@@ -1009,8 +1009,11 @@ static struct of_device_id __initdata pci_sun4v_match[] = { };static struct of_platform_driver pci_sun4v_driver = { - .name =DRIVER_NAME , - .match_table = pci_sun4v_match, + .driver = { + .name =DRIVER_NAME , + .owner =THIS_MODULE , + .of_match_table = pci_sun4v_match, + }, .probe = pci_sun4v_probe, };
arch/sparc/kernel/pmc.c +5 -2
@@ -79,8 +79,11 @@ static struct of_device_id __initdata pmc_match[] = {MODULE_DEVICE_TABLE (of, pmc_match);static struct of_platform_driver pmc_driver = { - .name ="pmc" , - .match_table = pmc_match, + .driver = { + .name ="pmc" , + .owner =THIS_MODULE , + .of_match_table = pmc_match, + }, .probe = pmc_probe, };
arch/sparc/kernel/power.c +4 -3
@@ -60,10 +60,11 @@ static struct of_device_id __initdata power_match[] = { };static struct of_platform_driver power_driver = { - .match_table = power_match, .probe = power_probe, - .driver = { - .name ="power" , + .driver = { + .name ="power" , + .owner =THIS_MODULE , + .of_match_table = power_match, }, };
arch/sparc/kernel/time_32.c +4 -3
@@ -185,10 +185,11 @@ static struct of_device_id __initdata clock_match[] = { };static struct of_platform_driver clock_driver = { - .match_table = clock_match, .probe = clock_probe, - .driver = { - .name ="rtc" , + .driver = { + .name ="rtc" , + .owner =THIS_MODULE , + .of_match_table = clock_match, }, };
arch/sparc/kernel/time_64.c +12 -9
@@ -462,10 +462,11 @@ static struct of_device_id __initdata rtc_match[] = { };static struct of_platform_driver rtc_driver = { - .match_table = rtc_match, .probe = rtc_probe, - .driver = { - .name ="rtc" , + .driver = { + .name ="rtc" , + .owner =THIS_MODULE , + .of_match_table = rtc_match, }, };
@@ -494,10 +495,11 @@ static struct of_device_id __initdata bq4802_match[] = { };static struct of_platform_driver bq4802_driver = { - .match_table = bq4802_match, .probe = bq4802_probe, - .driver = { - .name ="bq4802" , + .driver = { + .name ="bq4802" , + .owner =THIS_MODULE , + .of_match_table = bq4802_match, }, };
@@ -557,10 +559,11 @@ static struct of_device_id __initdata mostek_match[] = { };static struct of_platform_driver mostek_driver = { - .match_table = mostek_match, .probe = mostek_probe, - .driver = { - .name ="mostek" , + .driver = { + .name ="mostek" , + .owner =THIS_MODULE , + .of_match_table = mostek_match, }, };
PATCH 26/27 arch/sparc/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.
---
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 ++++++++++++--------- 14 files changed, 77 insertions(+), 42 deletions(-)
arch/sparc/include/asm/parport.h +5 -2
@@ -232,8 +232,11 @@ static const struct of_device_id ecpp_match[] = { };static struct of_platform_driver ecpp_driver = { - .name ="ecpp" , - .match_table = ecpp_match, + .driver = { + .name ="ecpp" , + .owner =THIS_MODULE , + .of_match_table = ecpp_match, + }, .probe = ecpp_probe, .remove =__devexit_p (ecpp_remove), };
arch/sparc/kernel/apc.c +5 -2
@@ -174,8 +174,11 @@ static struct of_device_id __initdata apc_match[] = {MODULE_DEVICE_TABLE (of, apc_match);static struct of_platform_driver apc_driver = { - .name ="apc" , - .match_table = apc_match, + .driver = { + .name ="apc" , + .owner =THIS_MODULE , + .of_match_table = apc_match, + }, .probe = apc_probe, };
arch/sparc/kernel/auxio_64.c +4 -3
@@ -132,10 +132,11 @@ static int __devinit auxio_probe(struct of_device *dev, const struct of_device_i }static struct of_platform_driver auxio_driver = { - .match_table = auxio_match, .probe = auxio_probe, - .driver = { - .name ="auxio" , + .driver = { + .name ="auxio" , + .owner =THIS_MODULE , + .of_match_table = auxio_match, }, };
arch/sparc/kernel/central.c +8 -6
@@ -148,10 +148,11 @@ static struct of_device_id __initdata clock_board_match[] = { };static struct of_platform_driver clock_board_driver = { - .match_table = clock_board_match, .probe = clock_board_probe, - .driver = { - .name ="clock_board" , + .driver = { + .name ="clock_board" , + .owner =THIS_MODULE , + .of_match_table = clock_board_match, }, };
@@ -253,10 +254,11 @@ static struct of_device_id __initdata fhc_match[] = { };static struct of_platform_driver fhc_driver = { - .match_table = fhc_match, .probe = fhc_probe, - .driver = { - .name ="fhc" , + .driver = { + .name ="fhc" , + .owner =THIS_MODULE , + .of_match_table = fhc_match, }, };
arch/sparc/kernel/chmc.c +5 -2
@@ -811,8 +811,11 @@ static const struct of_device_id us3mc_match[] = {MODULE_DEVICE_TABLE (of, us3mc_match);static struct of_platform_driver us3mc_driver = { - .name ="us3mc" , - .match_table = us3mc_match, + .driver = { + .name ="us3mc" , + .owner =THIS_MODULE , + .of_match_table = us3mc_match, + }, .probe = us3mc_probe, .remove =__devexit_p (us3mc_remove), };
arch/sparc/kernel/pci_fire.c +5 -2
@@ -508,8 +508,11 @@ static struct of_device_id __initdata fire_match[] = { };static struct of_platform_driver fire_driver = { - .name =DRIVER_NAME , - .match_table = fire_match, + .driver = { + .name =DRIVER_NAME , + .owner =THIS_MODULE , + .of_match_table = fire_match, + }, .probe = fire_probe, };
arch/sparc/kernel/pci_psycho.c +5 -2
@@ -602,8 +602,11 @@ static struct of_device_id __initdata psycho_match[] = { };static struct of_platform_driver psycho_driver = { - .name =DRIVER_NAME , - .match_table = psycho_match, + .driver = { + .name =DRIVER_NAME , + .owner =THIS_MODULE , + .of_match_table = psycho_match, + }, .probe = psycho_probe, };
arch/sparc/kernel/pci_sabre.c +5 -2
@@ -596,8 +596,11 @@ static struct of_device_id __initdata sabre_match[] = { };static struct of_platform_driver sabre_driver = { - .name =DRIVER_NAME , - .match_table = sabre_match, + .driver = { + .name =DRIVER_NAME , + .owner =THIS_MODULE , + .of_match_table = sabre_match, + }, .probe = sabre_probe, };
arch/sparc/kernel/pci_schizo.c +5 -2
@@ -1491,8 +1491,11 @@ static struct of_device_id __initdata schizo_match[] = { };static struct of_platform_driver schizo_driver = { - .name =DRIVER_NAME , - .match_table = schizo_match, + .driver = { + .name =DRIVER_NAME , + .owner =THIS_MODULE , + .of_match_table = schizo_match, + }, .probe = schizo_probe, };
arch/sparc/kernel/pci_sun4v.c +5 -2
@@ -1009,8 +1009,11 @@ static struct of_device_id __initdata pci_sun4v_match[] = { };static struct of_platform_driver pci_sun4v_driver = { - .name =DRIVER_NAME , - .match_table = pci_sun4v_match, + .driver = { + .name =DRIVER_NAME , + .owner =THIS_MODULE , + .of_match_table = pci_sun4v_match, + }, .probe = pci_sun4v_probe, };
arch/sparc/kernel/pmc.c +5 -2
@@ -79,8 +79,11 @@ static struct of_device_id __initdata pmc_match[] = {MODULE_DEVICE_TABLE (of, pmc_match);static struct of_platform_driver pmc_driver = { - .name ="pmc" , - .match_table = pmc_match, + .driver = { + .name ="pmc" , + .owner =THIS_MODULE , + .of_match_table = pmc_match, + }, .probe = pmc_probe, };
arch/sparc/kernel/power.c +4 -3
@@ -60,10 +60,11 @@ static struct of_device_id __initdata power_match[] = { };static struct of_platform_driver power_driver = { - .match_table = power_match, .probe = power_probe, - .driver = { - .name ="power" , + .driver = { + .name ="power" , + .owner =THIS_MODULE , + .of_match_table = power_match, }, };
arch/sparc/kernel/time_32.c +4 -3
@@ -185,10 +185,11 @@ static struct of_device_id __initdata clock_match[] = { };static struct of_platform_driver clock_driver = { - .match_table = clock_match, .probe = clock_probe, - .driver = { - .name ="rtc" , + .driver = { + .name ="rtc" , + .owner =THIS_MODULE , + .of_match_table = clock_match, }, };
arch/sparc/kernel/time_64.c +12 -9
@@ -462,10 +462,11 @@ static struct of_device_id __initdata rtc_match[] = { };static struct of_platform_driver rtc_driver = { - .match_table = rtc_match, .probe = rtc_probe, - .driver = { - .name ="rtc" , + .driver = { + .name ="rtc" , + .owner =THIS_MODULE , + .of_match_table = rtc_match, }, };
@@ -494,10 +495,11 @@ static struct of_device_id __initdata bq4802_match[] = { };static struct of_platform_driver bq4802_driver = { - .match_table = bq4802_match, .probe = bq4802_probe, - .driver = { - .name ="bq4802" , + .driver = { + .name ="bq4802" , + .owner =THIS_MODULE , + .of_match_table = bq4802_match, }, };
@@ -557,10 +559,11 @@ static struct of_device_id __initdata mostek_match[] = { };static struct of_platform_driver mostek_driver = { - .match_table = mostek_match, .probe = mostek_probe, - .driver = { - .name ="mostek" , + .driver = { + .name ="mostek" , + .owner =THIS_MODULE , + .of_match_table = mostek_match, }, };
PATCH 26/27 arch/sparc/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.
---
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 ++++++++++++--------- 14 files changed, 77 insertions(+), 42 deletions(-)
arch/sparc/include/asm/parport.h +5 -2
@@ -232,8 +232,11 @@ static const struct of_device_id ecpp_match[] = { };static struct of_platform_driver ecpp_driver = { - .name ="ecpp" , - .match_table = ecpp_match, + .driver = { + .name ="ecpp" , + .owner =THIS_MODULE , + .of_match_table = ecpp_match, + }, .probe = ecpp_probe, .remove =__devexit_p (ecpp_remove), };
arch/sparc/kernel/apc.c +5 -2
@@ -174,8 +174,11 @@ static struct of_device_id __initdata apc_match[] = {MODULE_DEVICE_TABLE (of, apc_match);static struct of_platform_driver apc_driver = { - .name ="apc" , - .match_table = apc_match, + .driver = { + .name ="apc" , + .owner =THIS_MODULE , + .of_match_table = apc_match, + }, .probe = apc_probe, };
arch/sparc/kernel/auxio_64.c +4 -3
@@ -132,10 +132,11 @@ static int __devinit auxio_probe(struct of_device *dev, const struct of_device_i }static struct of_platform_driver auxio_driver = { - .match_table = auxio_match, .probe = auxio_probe, - .driver = { - .name ="auxio" , + .driver = { + .name ="auxio" , + .owner =THIS_MODULE , + .of_match_table = auxio_match, }, };
arch/sparc/kernel/central.c +8 -6
@@ -148,10 +148,11 @@ static struct of_device_id __initdata clock_board_match[] = { };static struct of_platform_driver clock_board_driver = { - .match_table = clock_board_match, .probe = clock_board_probe, - .driver = { - .name ="clock_board" , + .driver = { + .name ="clock_board" , + .owner =THIS_MODULE , + .of_match_table = clock_board_match, }, };
@@ -253,10 +254,11 @@ static struct of_device_id __initdata fhc_match[] = { };static struct of_platform_driver fhc_driver = { - .match_table = fhc_match, .probe = fhc_probe, - .driver = { - .name ="fhc" , + .driver = { + .name ="fhc" , + .owner =THIS_MODULE , + .of_match_table = fhc_match, }, };
arch/sparc/kernel/chmc.c +5 -2
@@ -811,8 +811,11 @@ static const struct of_device_id us3mc_match[] = {MODULE_DEVICE_TABLE (of, us3mc_match);static struct of_platform_driver us3mc_driver = { - .name ="us3mc" , - .match_table = us3mc_match, + .driver = { + .name ="us3mc" , + .owner =THIS_MODULE , + .of_match_table = us3mc_match, + }, .probe = us3mc_probe, .remove =__devexit_p (us3mc_remove), };
arch/sparc/kernel/pci_fire.c +5 -2
@@ -508,8 +508,11 @@ static struct of_device_id __initdata fire_match[] = { };static struct of_platform_driver fire_driver = { - .name =DRIVER_NAME , - .match_table = fire_match, + .driver = { + .name =DRIVER_NAME , + .owner =THIS_MODULE , + .of_match_table = fire_match, + }, .probe = fire_probe, };
arch/sparc/kernel/pci_psycho.c +5 -2
@@ -602,8 +602,11 @@ static struct of_device_id __initdata psycho_match[] = { };static struct of_platform_driver psycho_driver = { - .name =DRIVER_NAME , - .match_table = psycho_match, + .driver = { + .name =DRIVER_NAME , + .owner =THIS_MODULE , + .of_match_table = psycho_match, + }, .probe = psycho_probe, };
arch/sparc/kernel/pci_sabre.c +5 -2
@@ -596,8 +596,11 @@ static struct of_device_id __initdata sabre_match[] = { };static struct of_platform_driver sabre_driver = { - .name =DRIVER_NAME , - .match_table = sabre_match, + .driver = { + .name =DRIVER_NAME , + .owner =THIS_MODULE , + .of_match_table = sabre_match, + }, .probe = sabre_probe, };
arch/sparc/kernel/pci_schizo.c +5 -2
@@ -1491,8 +1491,11 @@ static struct of_device_id __initdata schizo_match[] = { };static struct of_platform_driver schizo_driver = { - .name =DRIVER_NAME , - .match_table = schizo_match, + .driver = { + .name =DRIVER_NAME , + .owner =THIS_MODULE , + .of_match_table = schizo_match, + }, .probe = schizo_probe, };
arch/sparc/kernel/pci_sun4v.c +5 -2
@@ -1009,8 +1009,11 @@ static struct of_device_id __initdata pci_sun4v_match[] = { };static struct of_platform_driver pci_sun4v_driver = { - .name =DRIVER_NAME , - .match_table = pci_sun4v_match, + .driver = { + .name =DRIVER_NAME , + .owner =THIS_MODULE , + .of_match_table = pci_sun4v_match, + }, .probe = pci_sun4v_probe, };
arch/sparc/kernel/pmc.c +5 -2
@@ -79,8 +79,11 @@ static struct of_device_id __initdata pmc_match[] = {MODULE_DEVICE_TABLE (of, pmc_match);static struct of_platform_driver pmc_driver = { - .name ="pmc" , - .match_table = pmc_match, + .driver = { + .name ="pmc" , + .owner =THIS_MODULE , + .of_match_table = pmc_match, + }, .probe = pmc_probe, };
arch/sparc/kernel/power.c +4 -3
@@ -60,10 +60,11 @@ static struct of_device_id __initdata power_match[] = { };static struct of_platform_driver power_driver = { - .match_table = power_match, .probe = power_probe, - .driver = { - .name ="power" , + .driver = { + .name ="power" , + .owner =THIS_MODULE , + .of_match_table = power_match, }, };
arch/sparc/kernel/time_32.c +4 -3
@@ -185,10 +185,11 @@ static struct of_device_id __initdata clock_match[] = { };static struct of_platform_driver clock_driver = { - .match_table = clock_match, .probe = clock_probe, - .driver = { - .name ="rtc" , + .driver = { + .name ="rtc" , + .owner =THIS_MODULE , + .of_match_table = clock_match, }, };
arch/sparc/kernel/time_64.c +12 -9
@@ -462,10 +462,11 @@ static struct of_device_id __initdata rtc_match[] = { };static struct of_platform_driver rtc_driver = { - .match_table = rtc_match, .probe = rtc_probe, - .driver = { - .name ="rtc" , + .driver = { + .name ="rtc" , + .owner =THIS_MODULE , + .of_match_table = rtc_match, }, };
@@ -494,10 +495,11 @@ static struct of_device_id __initdata bq4802_match[] = { };static struct of_platform_driver bq4802_driver = { - .match_table = bq4802_match, .probe = bq4802_probe, - .driver = { - .name ="bq4802" , + .driver = { + .name ="bq4802" , + .owner =THIS_MODULE , + .of_match_table = bq4802_match, }, };
@@ -557,10 +559,11 @@ static struct of_device_id __initdata mostek_match[] = { };static struct of_platform_driver mostek_driver = { - .match_table = mostek_match, .probe = mostek_probe, - .driver = { - .name ="mostek" , + .driver = { + .name ="mostek" , + .owner =THIS_MODULE , + .of_match_table = mostek_match, }, };
PATCH 27/27 of: remove obsolete members from of_platform_driver
In reply to Grant Likely.name, .match_table and .owner already exist in struct device_driver. Remove the duplication from struct of_platform_driver.
---
drivers/of/platform.c | 7 ------- include/linux/of_platform.h | 4 ---- 2 files changed, 0 insertions(+), 11 deletions(-)
drivers/of/platform.c +0 -7
@@ -385,13 +385,6 @@ int of_bus_type_init(struct bus_type *bus, const char *name)int of_register_driver (struct of_platform_driver *drv,struct bus_type *bus) { -/* initialize common driver fields */ -if (!drv->driver.name) - drv->driver.name = drv->name; -if (!drv->driver.owner) - drv->driver.owner = drv->owner; -if (!drv->driver.of_match_table) - drv->driver.of_match_table = drv->match_table; drv->driver.bus = bus;/* register with core */
include/linux/of_platform.h +0 -4
@@ -31,10 +31,6 @@ extern struct bus_type of_platform_bus_type;*/ struct of_platform_driver { -const char *name; -const struct of_device_id *match_table; -struct module *owner; -int (*probe)(struct of_device * dev,const struct of_device_id *match);int (*remove)(struct of_device * dev);
PATCH 27/27 of: remove obsolete members from of_platform_driver
In reply to Grant Likely.name, .match_table and .owner already exist in struct device_driver. Remove the duplication from struct of_platform_driver.
---
drivers/of/platform.c | 7 ------- include/linux/of_platform.h | 4 ---- 2 files changed, 0 insertions(+), 11 deletions(-)
drivers/of/platform.c +0 -7
@@ -385,13 +385,6 @@ int of_bus_type_init(struct bus_type *bus, const char *name)int of_register_driver (struct of_platform_driver *drv,struct bus_type *bus) { -/* initialize common driver fields */ -if (!drv->driver.name) - drv->driver.name = drv->name; -if (!drv->driver.owner) - drv->driver.owner = drv->owner; -if (!drv->driver.of_match_table) - drv->driver.of_match_table = drv->match_table; drv->driver.bus = bus;/* register with core */
include/linux/of_platform.h +0 -4
@@ -31,10 +31,6 @@ extern struct bus_type of_platform_bus_type;*/ struct of_platform_driver { -const char *name; -const struct of_device_id *match_table; -struct module *owner; -int (*probe)(struct of_device * dev,const struct of_device_id *match);int (*remove)(struct of_device * dev);
PATCH 27/27 of: remove obsolete members from of_platform_driver
In reply to Grant Likely.name, .match_table and .owner already exist in struct device_driver. Remove the duplication from struct of_platform_driver.
---
drivers/of/platform.c | 7 ------- include/linux/of_platform.h | 4 ---- 2 files changed, 0 insertions(+), 11 deletions(-)
drivers/of/platform.c +0 -7
@@ -385,13 +385,6 @@ int of_bus_type_init(struct bus_type *bus, const char *name)int of_register_driver (struct of_platform_driver *drv,struct bus_type *bus) { -/* initialize common driver fields */ -if (!drv->driver.name) - drv->driver.name = drv->name; -if (!drv->driver.owner) - drv->driver.owner = drv->owner; -if (!drv->driver.of_match_table) - drv->driver.of_match_table = drv->match_table; drv->driver.bus = bus;/* register with core */
include/linux/of_platform.h +0 -4
@@ -31,10 +31,6 @@ extern struct bus_type of_platform_bus_type;*/ struct of_platform_driver { -const char *name; -const struct of_device_id *match_table; -struct module *owner; -int (*probe)(struct of_device * dev,const struct of_device_id *match);int (*remove)(struct of_device * dev);
PATCH 27/27 of: remove obsolete members from of_platform_driver
In reply to Grant Likely.name, .match_table and .owner already exist in struct device_driver. Remove the duplication from struct of_platform_driver.
---
drivers/of/platform.c | 7 ------- include/linux/of_platform.h | 4 ---- 2 files changed, 0 insertions(+), 11 deletions(-)
drivers/of/platform.c +0 -7
@@ -385,13 +385,6 @@ int of_bus_type_init(struct bus_type *bus, const char *name)int of_register_driver (struct of_platform_driver *drv,struct bus_type *bus) { -/* initialize common driver fields */ -if (!drv->driver.name) - drv->driver.name = drv->name; -if (!drv->driver.owner) - drv->driver.owner = drv->owner; -if (!drv->driver.of_match_table) - drv->driver.of_match_table = drv->match_table; drv->driver.bus = bus;/* register with core */
include/linux/of_platform.h +0 -4
@@ -31,10 +31,6 @@ extern struct bus_type of_platform_bus_type;*/ struct of_platform_driver { -const char *name; -const struct of_device_id *match_table; -struct module *owner; -int (*probe)(struct of_device * dev,const struct of_device_id *match);int (*remove)(struct of_device * dev);
PATCH 27/27 of: remove obsolete members from of_platform_driver
In reply to Grant Likely.name, .match_table and .owner already exist in struct device_driver. Remove the duplication from struct of_platform_driver.
---
drivers/of/platform.c | 7 ------- include/linux/of_platform.h | 4 ---- 2 files changed, 0 insertions(+), 11 deletions(-)
drivers/of/platform.c +0 -7
@@ -385,13 +385,6 @@ int of_bus_type_init(struct bus_type *bus, const char *name)int of_register_driver (struct of_platform_driver *drv,struct bus_type *bus) { -/* initialize common driver fields */ -if (!drv->driver.name) - drv->driver.name = drv->name; -if (!drv->driver.owner) - drv->driver.owner = drv->owner; -if (!drv->driver.of_match_table) - drv->driver.of_match_table = drv->match_table; drv->driver.bus = bus;/* register with core */
include/linux/of_platform.h +0 -4
@@ -31,10 +31,6 @@ extern struct bus_type of_platform_bus_type;*/ struct of_platform_driver { -const char *name; -const struct of_device_id *match_table; -struct module *owner; -int (*probe)(struct of_device * dev,const struct of_device_id *match);int (*remove)(struct of_device * dev);