Skip to content

Commit

Permalink
dmaengine: Switch back to struct platform_driver::remove()
Browse files Browse the repository at this point in the history
After commit 0edb555 ("platform: Make platform_driver::remove()
return void") .remove() is (again) the right callback to implement for
platform drivers.

Convert all platform drivers below drivers/dma after the previous
conversion commits apart from the wireless drivers to use .remove(),
with the eventual goal to drop struct platform_driver::remove_new(). As
.remove() and .remove_new() have the same prototypes, conversion is done
by just changing the structure member name in the driver initializer.

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@baylibre.com>
Link: https://lore.kernel.org/r/20241004062227.187726-2-u.kleine-koenig@baylibre.com
Signed-off-by: Vinod Koul <vkoul@kernel.org>
  • Loading branch information
Uwe Kleine-König authored and Vinod Koul committed Oct 14, 2024
1 parent 0aa4523 commit 76355c2
Show file tree
Hide file tree
Showing 65 changed files with 66 additions and 66 deletions.
2 changes: 1 addition & 1 deletion drivers/dma/altera-msgdma.c
Original file line number Diff line number Diff line change
Expand Up @@ -954,7 +954,7 @@ static struct platform_driver msgdma_driver = {
.of_match_table = of_match_ptr(msgdma_match),
},
.probe = msgdma_probe,
.remove_new = msgdma_remove,
.remove = msgdma_remove,
};

module_platform_driver(msgdma_driver);
Expand Down
2 changes: 1 addition & 1 deletion drivers/dma/amd/qdma/qdma.c
Original file line number Diff line number Diff line change
Expand Up @@ -1133,7 +1133,7 @@ static struct platform_driver amd_qdma_driver = {
.name = "amd-qdma",
},
.probe = amd_qdma_probe,
.remove_new = amd_qdma_remove,
.remove = amd_qdma_remove,
};

module_platform_driver(amd_qdma_driver);
Expand Down
2 changes: 1 addition & 1 deletion drivers/dma/apple-admac.c
Original file line number Diff line number Diff line change
Expand Up @@ -950,7 +950,7 @@ static struct platform_driver apple_admac_driver = {
.of_match_table = admac_of_match,
},
.probe = admac_probe,
.remove_new = admac_remove,
.remove = admac_remove,
};
module_platform_driver(apple_admac_driver);

Expand Down
2 changes: 1 addition & 1 deletion drivers/dma/at_hdmac.c
Original file line number Diff line number Diff line change
Expand Up @@ -2250,7 +2250,7 @@ static const struct dev_pm_ops __maybe_unused at_dma_dev_pm_ops = {
};

static struct platform_driver at_dma_driver = {
.remove_new = at_dma_remove,
.remove = at_dma_remove,
.shutdown = at_dma_shutdown,
.id_table = atdma_devtypes,
.driver = {
Expand Down
2 changes: 1 addition & 1 deletion drivers/dma/at_xdmac.c
Original file line number Diff line number Diff line change
Expand Up @@ -2476,7 +2476,7 @@ MODULE_DEVICE_TABLE(of, atmel_xdmac_dt_ids);

static struct platform_driver at_xdmac_driver = {
.probe = at_xdmac_probe,
.remove_new = at_xdmac_remove,
.remove = at_xdmac_remove,
.driver = {
.name = "at_xdmac",
.of_match_table = of_match_ptr(atmel_xdmac_dt_ids),
Expand Down
2 changes: 1 addition & 1 deletion drivers/dma/bcm-sba-raid.c
Original file line number Diff line number Diff line change
Expand Up @@ -1756,7 +1756,7 @@ MODULE_DEVICE_TABLE(of, sba_of_match);

static struct platform_driver sba_driver = {
.probe = sba_probe,
.remove_new = sba_remove,
.remove = sba_remove,
.driver = {
.name = "bcm-sba-raid",
.of_match_table = sba_of_match,
Expand Down
2 changes: 1 addition & 1 deletion drivers/dma/bcm2835-dma.c
Original file line number Diff line number Diff line change
Expand Up @@ -1029,7 +1029,7 @@ static void bcm2835_dma_remove(struct platform_device *pdev)

static struct platform_driver bcm2835_dma_driver = {
.probe = bcm2835_dma_probe,
.remove_new = bcm2835_dma_remove,
.remove = bcm2835_dma_remove,
.driver = {
.name = "bcm2835-dma",
.of_match_table = of_match_ptr(bcm2835_dma_of_match),
Expand Down
2 changes: 1 addition & 1 deletion drivers/dma/bestcomm/bestcomm.c
Original file line number Diff line number Diff line change
Expand Up @@ -486,7 +486,7 @@ MODULE_DEVICE_TABLE(of, mpc52xx_bcom_of_match);

static struct platform_driver mpc52xx_bcom_of_platform_driver = {
.probe = mpc52xx_bcom_probe,
.remove_new = mpc52xx_bcom_remove,
.remove = mpc52xx_bcom_remove,
.driver = {
.name = DRIVER_NAME,
.of_match_table = mpc52xx_bcom_of_match,
Expand Down
2 changes: 1 addition & 1 deletion drivers/dma/dma-jz4780.c
Original file line number Diff line number Diff line change
Expand Up @@ -1122,7 +1122,7 @@ MODULE_DEVICE_TABLE(of, jz4780_dma_dt_match);

static struct platform_driver jz4780_dma_driver = {
.probe = jz4780_dma_probe,
.remove_new = jz4780_dma_remove,
.remove = jz4780_dma_remove,
.driver = {
.name = "jz4780-dma",
.of_match_table = jz4780_dma_dt_match,
Expand Down
2 changes: 1 addition & 1 deletion drivers/dma/dw-axi-dmac/dw-axi-dmac-platform.c
Original file line number Diff line number Diff line change
Expand Up @@ -1676,7 +1676,7 @@ MODULE_DEVICE_TABLE(of, dw_dma_of_id_table);

static struct platform_driver dw_driver = {
.probe = dw_probe,
.remove_new = dw_remove,
.remove = dw_remove,
.driver = {
.name = KBUILD_MODNAME,
.of_match_table = dw_dma_of_id_table,
Expand Down
2 changes: 1 addition & 1 deletion drivers/dma/dw/platform.c
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,7 @@ static const struct dev_pm_ops dw_dev_pm_ops = {

static struct platform_driver dw_driver = {
.probe = dw_probe,
.remove_new = dw_remove,
.remove = dw_remove,
.shutdown = dw_shutdown,
.driver = {
.name = DRV_NAME,
Expand Down
2 changes: 1 addition & 1 deletion drivers/dma/fsl-edma-main.c
Original file line number Diff line number Diff line change
Expand Up @@ -740,7 +740,7 @@ static struct platform_driver fsl_edma_driver = {
.pm = &fsl_edma_pm_ops,
},
.probe = fsl_edma_probe,
.remove_new = fsl_edma_remove,
.remove = fsl_edma_remove,
};

static int __init fsl_edma_init(void)
Expand Down
2 changes: 1 addition & 1 deletion drivers/dma/fsl-qdma.c
Original file line number Diff line number Diff line change
Expand Up @@ -1288,7 +1288,7 @@ static struct platform_driver fsl_qdma_driver = {
.of_match_table = fsl_qdma_dt_ids,
},
.probe = fsl_qdma_probe,
.remove_new = fsl_qdma_remove,
.remove = fsl_qdma_remove,
};

module_platform_driver(fsl_qdma_driver);
Expand Down
2 changes: 1 addition & 1 deletion drivers/dma/fsl_raid.c
Original file line number Diff line number Diff line change
Expand Up @@ -886,7 +886,7 @@ static struct platform_driver fsl_re_driver = {
.of_match_table = fsl_re_ids,
},
.probe = fsl_re_probe,
.remove_new = fsl_re_remove,
.remove = fsl_re_remove,
};

module_platform_driver(fsl_re_driver);
Expand Down
2 changes: 1 addition & 1 deletion drivers/dma/fsldma.c
Original file line number Diff line number Diff line change
Expand Up @@ -1404,7 +1404,7 @@ static struct platform_driver fsldma_of_driver = {
#endif
},
.probe = fsldma_of_probe,
.remove_new = fsldma_of_remove,
.remove = fsldma_of_remove,
};

/*----------------------------------------------------------------------------*/
Expand Down
2 changes: 1 addition & 1 deletion drivers/dma/idma64.c
Original file line number Diff line number Diff line change
Expand Up @@ -693,7 +693,7 @@ static const struct dev_pm_ops idma64_dev_pm_ops = {

static struct platform_driver idma64_platform_driver = {
.probe = idma64_platform_probe,
.remove_new = idma64_platform_remove,
.remove = idma64_platform_remove,
.driver = {
.name = LPSS_IDMA64_DRIVER_NAME,
.pm = &idma64_dev_pm_ops,
Expand Down
2 changes: 1 addition & 1 deletion drivers/dma/img-mdc-dma.c
Original file line number Diff line number Diff line change
Expand Up @@ -1076,7 +1076,7 @@ static struct platform_driver mdc_dma_driver = {
.of_match_table = of_match_ptr(mdc_dma_of_match),
},
.probe = mdc_dma_probe,
.remove_new = mdc_dma_remove,
.remove = mdc_dma_remove,
};
module_platform_driver(mdc_dma_driver);

Expand Down
2 changes: 1 addition & 1 deletion drivers/dma/imx-dma.c
Original file line number Diff line number Diff line change
Expand Up @@ -1233,7 +1233,7 @@ static struct platform_driver imxdma_driver = {
.name = "imx-dma",
.of_match_table = imx_dma_of_dev_id,
},
.remove_new = imxdma_remove,
.remove = imxdma_remove,
};

static int __init imxdma_module_init(void)
Expand Down
2 changes: 1 addition & 1 deletion drivers/dma/imx-sdma.c
Original file line number Diff line number Diff line change
Expand Up @@ -2440,7 +2440,7 @@ static struct platform_driver sdma_driver = {
.name = "imx-sdma",
.of_match_table = sdma_dt_ids,
},
.remove_new = sdma_remove,
.remove = sdma_remove,
.probe = sdma_probe,
};

Expand Down
2 changes: 1 addition & 1 deletion drivers/dma/k3dma.c
Original file line number Diff line number Diff line change
Expand Up @@ -1028,7 +1028,7 @@ static struct platform_driver k3_pdma_driver = {
.of_match_table = k3_pdma_dt_ids,
},
.probe = k3_dma_probe,
.remove_new = k3_dma_remove,
.remove = k3_dma_remove,
};

module_platform_driver(k3_pdma_driver);
Expand Down
2 changes: 1 addition & 1 deletion drivers/dma/ls2x-apb-dma.c
Original file line number Diff line number Diff line change
Expand Up @@ -692,7 +692,7 @@ MODULE_DEVICE_TABLE(of, ls2x_dma_of_match_table);

static struct platform_driver ls2x_dmac_driver = {
.probe = ls2x_dma_probe,
.remove_new = ls2x_dma_remove,
.remove = ls2x_dma_remove,
.driver = {
.name = "ls2x-apbdma",
.of_match_table = ls2x_dma_of_match_table,
Expand Down
2 changes: 1 addition & 1 deletion drivers/dma/mcf-edma-main.c
Original file line number Diff line number Diff line change
Expand Up @@ -267,7 +267,7 @@ static struct platform_driver mcf_edma_driver = {
.name = "mcf-edma",
},
.probe = mcf_edma_probe,
.remove_new = mcf_edma_remove,
.remove = mcf_edma_remove,
};

bool mcf_edma_filter_fn(struct dma_chan *chan, void *param)
Expand Down
2 changes: 1 addition & 1 deletion drivers/dma/mediatek/mtk-cqdma.c
Original file line number Diff line number Diff line change
Expand Up @@ -922,7 +922,7 @@ static void mtk_cqdma_remove(struct platform_device *pdev)

static struct platform_driver mtk_cqdma_driver = {
.probe = mtk_cqdma_probe,
.remove_new = mtk_cqdma_remove,
.remove = mtk_cqdma_remove,
.driver = {
.name = KBUILD_MODNAME,
.of_match_table = mtk_cqdma_match,
Expand Down
2 changes: 1 addition & 1 deletion drivers/dma/mediatek/mtk-hsdma.c
Original file line number Diff line number Diff line change
Expand Up @@ -1038,7 +1038,7 @@ static void mtk_hsdma_remove(struct platform_device *pdev)

static struct platform_driver mtk_hsdma_driver = {
.probe = mtk_hsdma_probe,
.remove_new = mtk_hsdma_remove,
.remove = mtk_hsdma_remove,
.driver = {
.name = KBUILD_MODNAME,
.of_match_table = mtk_hsdma_match,
Expand Down
2 changes: 1 addition & 1 deletion drivers/dma/mediatek/mtk-uart-apdma.c
Original file line number Diff line number Diff line change
Expand Up @@ -637,7 +637,7 @@ static const struct dev_pm_ops mtk_uart_apdma_pm_ops = {

static struct platform_driver mtk_uart_apdma_driver = {
.probe = mtk_uart_apdma_probe,
.remove_new = mtk_uart_apdma_remove,
.remove = mtk_uart_apdma_remove,
.driver = {
.name = KBUILD_MODNAME,
.pm = &mtk_uart_apdma_pm_ops,
Expand Down
2 changes: 1 addition & 1 deletion drivers/dma/milbeaut-hdmac.c
Original file line number Diff line number Diff line change
Expand Up @@ -571,7 +571,7 @@ MODULE_DEVICE_TABLE(of, milbeaut_hdmac_match);

static struct platform_driver milbeaut_hdmac_driver = {
.probe = milbeaut_hdmac_probe,
.remove_new = milbeaut_hdmac_remove,
.remove = milbeaut_hdmac_remove,
.driver = {
.name = "milbeaut-m10v-hdmac",
.of_match_table = milbeaut_hdmac_match,
Expand Down
2 changes: 1 addition & 1 deletion drivers/dma/milbeaut-xdmac.c
Original file line number Diff line number Diff line change
Expand Up @@ -409,7 +409,7 @@ MODULE_DEVICE_TABLE(of, milbeaut_xdmac_match);

static struct platform_driver milbeaut_xdmac_driver = {
.probe = milbeaut_xdmac_probe,
.remove_new = milbeaut_xdmac_remove,
.remove = milbeaut_xdmac_remove,
.driver = {
.name = "milbeaut-m10v-xdmac",
.of_match_table = milbeaut_xdmac_match,
Expand Down
2 changes: 1 addition & 1 deletion drivers/dma/mmp_pdma.c
Original file line number Diff line number Diff line change
Expand Up @@ -1137,7 +1137,7 @@ static struct platform_driver mmp_pdma_driver = {
},
.id_table = mmp_pdma_id_table,
.probe = mmp_pdma_probe,
.remove_new = mmp_pdma_remove,
.remove = mmp_pdma_remove,
};

module_platform_driver(mmp_pdma_driver);
Expand Down
2 changes: 1 addition & 1 deletion drivers/dma/mmp_tdma.c
Original file line number Diff line number Diff line change
Expand Up @@ -736,7 +736,7 @@ static struct platform_driver mmp_tdma_driver = {
.of_match_table = mmp_tdma_dt_ids,
},
.probe = mmp_tdma_probe,
.remove_new = mmp_tdma_remove,
.remove = mmp_tdma_remove,
};

module_platform_driver(mmp_tdma_driver);
Expand Down
2 changes: 1 addition & 1 deletion drivers/dma/moxart-dma.c
Original file line number Diff line number Diff line change
Expand Up @@ -644,7 +644,7 @@ MODULE_DEVICE_TABLE(of, moxart_dma_match);

static struct platform_driver moxart_driver = {
.probe = moxart_probe,
.remove_new = moxart_remove,
.remove = moxart_remove,
.driver = {
.name = "moxart-dma-engine",
.of_match_table = moxart_dma_match,
Expand Down
2 changes: 1 addition & 1 deletion drivers/dma/mpc512x_dma.c
Original file line number Diff line number Diff line change
Expand Up @@ -1110,7 +1110,7 @@ MODULE_DEVICE_TABLE(of, mpc_dma_match);

static struct platform_driver mpc_dma_driver = {
.probe = mpc_dma_probe,
.remove_new = mpc_dma_remove,
.remove = mpc_dma_remove,
.driver = {
.name = DRV_NAME,
.of_match_table = mpc_dma_match,
Expand Down
2 changes: 1 addition & 1 deletion drivers/dma/mv_xor_v2.c
Original file line number Diff line number Diff line change
Expand Up @@ -884,7 +884,7 @@ static struct platform_driver mv_xor_v2_driver = {
.probe = mv_xor_v2_probe,
.suspend = mv_xor_v2_suspend,
.resume = mv_xor_v2_resume,
.remove_new = mv_xor_v2_remove,
.remove = mv_xor_v2_remove,
.driver = {
.name = "mv_xor_v2",
.of_match_table = of_match_ptr(mv_xor_v2_dt_ids),
Expand Down
2 changes: 1 addition & 1 deletion drivers/dma/nbpfaxi.c
Original file line number Diff line number Diff line change
Expand Up @@ -1515,7 +1515,7 @@ static struct platform_driver nbpf_driver = {
},
.id_table = nbpf_ids,
.probe = nbpf_probe,
.remove_new = nbpf_remove,
.remove = nbpf_remove,
};

module_platform_driver(nbpf_driver);
Expand Down
2 changes: 1 addition & 1 deletion drivers/dma/owl-dma.c
Original file line number Diff line number Diff line change
Expand Up @@ -1252,7 +1252,7 @@ static void owl_dma_remove(struct platform_device *pdev)

static struct platform_driver owl_dma_driver = {
.probe = owl_dma_probe,
.remove_new = owl_dma_remove,
.remove = owl_dma_remove,
.driver = {
.name = "dma-owl",
.of_match_table = of_match_ptr(owl_dma_match),
Expand Down
2 changes: 1 addition & 1 deletion drivers/dma/ppc4xx/adma.c
Original file line number Diff line number Diff line change
Expand Up @@ -4549,7 +4549,7 @@ MODULE_DEVICE_TABLE(of, ppc440spe_adma_of_match);

static struct platform_driver ppc440spe_adma_driver = {
.probe = ppc440spe_adma_probe,
.remove_new = ppc440spe_adma_remove,
.remove = ppc440spe_adma_remove,
.driver = {
.name = "PPC440SP(E)-ADMA",
.of_match_table = ppc440spe_adma_of_match,
Expand Down
2 changes: 1 addition & 1 deletion drivers/dma/pxa_dma.c
Original file line number Diff line number Diff line change
Expand Up @@ -1442,7 +1442,7 @@ static struct platform_driver pxad_driver = {
},
.id_table = pxad_id_table,
.probe = pxad_probe,
.remove_new = pxad_remove,
.remove = pxad_remove,
};

static bool pxad_filter_fn(struct dma_chan *chan, void *param)
Expand Down
2 changes: 1 addition & 1 deletion drivers/dma/qcom/bam_dma.c
Original file line number Diff line number Diff line change
Expand Up @@ -1469,7 +1469,7 @@ static const struct dev_pm_ops bam_dma_pm_ops = {

static struct platform_driver bam_dma_driver = {
.probe = bam_dma_probe,
.remove_new = bam_dma_remove,
.remove = bam_dma_remove,
.driver = {
.name = "bam-dma-engine",
.pm = &bam_dma_pm_ops,
Expand Down
2 changes: 1 addition & 1 deletion drivers/dma/qcom/hidma.c
Original file line number Diff line number Diff line change
Expand Up @@ -948,7 +948,7 @@ MODULE_DEVICE_TABLE(acpi, hidma_acpi_ids);

static struct platform_driver hidma_driver = {
.probe = hidma_probe,
.remove_new = hidma_remove,
.remove = hidma_remove,
.shutdown = hidma_shutdown,
.driver = {
.name = "hidma",
Expand Down
2 changes: 1 addition & 1 deletion drivers/dma/qcom/qcom_adm.c
Original file line number Diff line number Diff line change
Expand Up @@ -937,7 +937,7 @@ MODULE_DEVICE_TABLE(of, adm_of_match);

static struct platform_driver adm_dma_driver = {
.probe = adm_dma_probe,
.remove_new = adm_dma_remove,
.remove = adm_dma_remove,
.driver = {
.name = "adm-dma-engine",
.of_match_table = adm_of_match,
Expand Down
2 changes: 1 addition & 1 deletion drivers/dma/sa11x0-dma.c
Original file line number Diff line number Diff line change
Expand Up @@ -1079,7 +1079,7 @@ static struct platform_driver sa11x0_dma_driver = {
.pm = &sa11x0_dma_pm_ops,
},
.probe = sa11x0_dma_probe,
.remove_new = sa11x0_dma_remove,
.remove = sa11x0_dma_remove,
};

static int __init sa11x0_dma_init(void)
Expand Down
2 changes: 1 addition & 1 deletion drivers/dma/sf-pdma/sf-pdma.c
Original file line number Diff line number Diff line change
Expand Up @@ -633,7 +633,7 @@ MODULE_DEVICE_TABLE(of, sf_pdma_dt_ids);

static struct platform_driver sf_pdma_driver = {
.probe = sf_pdma_probe,
.remove_new = sf_pdma_remove,
.remove = sf_pdma_remove,
.driver = {
.name = "sf-pdma",
.of_match_table = sf_pdma_dt_ids,
Expand Down
2 changes: 1 addition & 1 deletion drivers/dma/sh/rcar-dmac.c
Original file line number Diff line number Diff line change
Expand Up @@ -2037,7 +2037,7 @@ static struct platform_driver rcar_dmac_driver = {
.of_match_table = rcar_dmac_of_ids,
},
.probe = rcar_dmac_probe,
.remove_new = rcar_dmac_remove,
.remove = rcar_dmac_remove,
.shutdown = rcar_dmac_shutdown,
};

Expand Down
2 changes: 1 addition & 1 deletion drivers/dma/sh/rz-dmac.c
Original file line number Diff line number Diff line change
Expand Up @@ -1004,7 +1004,7 @@ static struct platform_driver rz_dmac_driver = {
.of_match_table = of_rz_dmac_match,
},
.probe = rz_dmac_probe,
.remove_new = rz_dmac_remove,
.remove = rz_dmac_remove,
};

module_platform_driver(rz_dmac_driver);
Expand Down
2 changes: 1 addition & 1 deletion drivers/dma/sh/shdmac.c
Original file line number Diff line number Diff line change
Expand Up @@ -906,7 +906,7 @@ static struct platform_driver sh_dmae_driver = {
.pm = &sh_dmae_pm,
.name = SH_DMAE_DRV_NAME,
},
.remove_new = sh_dmae_remove,
.remove = sh_dmae_remove,
};

static int __init sh_dmae_init(void)
Expand Down
Loading

0 comments on commit 76355c2

Please sign in to comment.