mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-09-26 20:38:12 +00:00
Code Issues Releases Wiki Activity

Memory controller drivers for v6.8, part two

Browse source 
Convert all drivers platform remove callback to the "remove_new" which
 returns void.  Usual rationale from Uwe:
 
   The .remove() callback for a platform driver returns an int which
   makes many driver authors wrongly assume it's possible to do error
   handling by returning an error code. However the value returned is
   ignored (apart from emitting a warning) and this typically results in
   resource leaks.
 -----BEGIN PGP SIGNATURE-----
 
 iQJEBAABCgAuFiEE3dJiKD0RGyM7briowTdm5oaLg9cFAmWEERoQHGtyemtAa2Vy
 bmVsLm9yZwAKCRDBN2bmhouD15/gEACLUhnPJ72MQCywqJXfcPt0FgJJB8HxaLfh
 S9fJb6ipxQdqVcj5Liyci8Rt6ZKfZAf8Q+Yu/cMG1gblzFdJq23tcl2I+W9Cbw/K
 +YRzjXNvdnZS2T2jAnKcE+Lz1h2emPY5uxuAYRiWiiglMxzqjU305siUHRwKDpMG
 6m1q5eqlw6P1YDFnRSD7wVjyB6mLdNSC1JRWcMJIyPcxbtlMOdkJGwQ2T/PKYIjE
 Uf6Hp8+ZLL6dhSr5XRwOCQ+3dR0BV485m4t8uQXDqYRgCQNw7Jij7Oqo1MG71LY9
 OvfRdI5WHcRI8vED3U9AdYOxITchhg//+dd14oItNyvoQHAUEeVIxnk+FciKciKc
 P84z5T2Rx2R6yE8+tkAs6oDNFw9wT1+MUL+58x2V9rolXC0XSnZ+9kvNBkGsW47n
 KH0O/I40jLz0wNP/RoLv3/ec0y/dd+DFFMRD/6i2OlQSBa1cjqnND75OTugnVi6f
 yfjKPYip9/pFHqrppt5bqAxn6PaI4Vb0ar85Qtf90WWEQQIYvsdHrFI1fQRqwvqC
 7OuN2skesQRgmZvqSe1CVZYFRdYuS+tVQ2UEsQcMXxvfQYJgmdkGDc/zNov+/i4p
 kORvSvVBG5etpBVNINXDDmukG+zHvIbfuW30MW4pbQC7g3InZfbEXdtxOuIQQWXc
 x05uiol0jQ==
 =ZtIR
 -----END PGP SIGNATURE-----
gpgsig -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEiK/NIGsWEZVxh/FrYKtH/8kJUicFAmWFc70ACgkQYKtH/8kJ
 UifbtxAA1YbWH6KCDvPK3Dwr/ZZ+xj3a5K+6/W9vQUUqhSPPqNxhOYc4rJCh5lDU
 27VSbjo68RSCzwXqvso9sixfD5pS5jE6u6Y3kElMZdKXGtRJ/eS9d1v6wJ0VpMO5
 VvDo9z8NhN9JtMMibC7wxaKWWERmG70MFpSdXFttu2ObXcpngi0w2pmP5hO28PFq
 uXTQI85e1u1DQhvQfDjZP7ELOK52HSFlteEFArKcw4pGwTGayJMNJReA4GeLObmX
 XGJFkQ1eXOCGWP457eQHjYnWVxg+mQQmb4blfySqQNpGqZy/H3dIjezmJc3hbP8T
 ELlGwngo+oHld1fmXvGBbko9D7IHuDahNibEuEPwnPlz5/eBembENyrahAgWJ906
 A+vqma2OyCXxgEkNE7wFvZEgq+A2FGV/I2ok3s+wtFCkfpnTjeHZvx810WgI6Ffp
 ge9UNARbFmrnf5ntrm64PAIYicpXU8orTmFiN6Q91ZfFIkDGxgU4BOyhcdsiZrNg
 4xE8u7xGLBGW/XE3hE6xRmakMCAIBjrAciG/YQvSP+Y0QEHGZAGN29zFTeHj6Wgd
 gvbUyRukzb7Ig1z2tBp77BPsQmTt4JCUv1bk+TCStROdq/DOSgDsH57s9A3RS7G3
 arrld/yi7DnZu3s0rywtLmJf6rEFU19UevVCCqVTtqw8mqZi608=
 =38bn
 -----END PGP SIGNATURE-----

Merge tag 'memory-controller-drv-6.8-2' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-mem-ctrl into soc/drivers

Memory controller drivers for v6.8, part two

Convert all drivers platform remove callback to the "remove_new" which
returns void.  Usual rationale from Uwe:

  The .remove() callback for a platform driver returns an int which
  makes many driver authors wrongly assume it's possible to do error
  handling by returning an error code. However the value returned is
  ignored (apart from emitting a warning) and this typically results in
  resource leaks.

* tag 'memory-controller-drv-6.8-2' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-mem-ctrl:
  memory: ti-emif-pm: Convert to platform remove callback returning void
  memory: ti-aemif: Convert to platform remove callback returning void
  memory: tegra210-emc: Convert to platform remove callback returning void
  memory: tegra186-emc: Convert to platform remove callback returning void
  memory: stm32-fmc2-ebi: Convert to platform remove callback returning void
  memory: exynos5422-dmc: Convert to platform remove callback returning void
  memory: renesas-rpc-if: Convert to platform remove callback returning void
  memory: omap-gpmc: Convert to platform remove callback returning void
  memory: mtk-smi: Convert to platform remove callback returning void
  memory: jz4780-nemc: Convert to platform remove callback returning void
  memory: fsl_ifc: Convert to platform remove callback returning void
  memory: fsl-corenet-cf: Convert to platform remove callback returning void
  memory: emif: Convert to platform remove callback returning void
  memory: brcmstb_memc: Convert to platform remove callback returning void
  memory: brcmstb_dpfe: Convert to platform remove callback returning void

Link: https://lore.kernel.org/r/20231221101956.16351-1-krzysztof.kozlowski@linaro.org
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Arnd Bergmann 2023-12-22 11:32:04 +00:00
commit 6fe341a24b
15 changed files with 32 additions and 60 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
drivers/memory/brcmstb_dpfe.c
View file

@ -909,13 +909,11 @@ static int brcmstb_dpfe_probe(struct platform_device *pdev)
return ret;
}
static int brcmstb_dpfe_remove(struct platform_device *pdev)
static void brcmstb_dpfe_remove(struct platform_device *pdev)
{
struct brcmstb_dpfe_priv *priv = dev_get_drvdata(&pdev->dev);
sysfs_remove_groups(&pdev->dev.kobj, priv->dpfe_api->sysfs_attrs);
return 0;
}
static const struct of_device_id brcmstb_dpfe_of_match[] = {
@ -936,7 +934,7 @@ static struct platform_driver brcmstb_dpfe_driver = {
.of_match_table = brcmstb_dpfe_of_match,
},
.probe = brcmstb_dpfe_probe,
.remove = brcmstb_dpfe_remove,
.remove_new = brcmstb_dpfe_remove,
.resume = brcmstb_dpfe_resume,
};

6
drivers/memory/brcmstb_memc.c
View file

@ -152,13 +152,11 @@ static int brcmstb_memc_probe(struct platform_device *pdev)
return 0;
}
static int brcmstb_memc_remove(struct platform_device *pdev)
static void brcmstb_memc_remove(struct platform_device *pdev)
{
struct device *dev = &pdev->dev;
sysfs_remove_group(&dev->kobj, &dev_attr_group);
return 0;
}
enum brcmstb_memc_hwtype {
@ -284,7 +282,7 @@ static DEFINE_SIMPLE_DEV_PM_OPS(brcmstb_memc_pm_ops, brcmstb_memc_suspend,
static struct platform_driver brcmstb_memc_driver = {
.probe = brcmstb_memc_probe,
.remove = brcmstb_memc_remove,
.remove_new = brcmstb_memc_remove,
.driver = {
.name = "brcmstb_memc",
.of_match_table = brcmstb_memc_of_match,

6
drivers/memory/emif.c
View file

@ -1159,13 +1159,11 @@ static int __init_or_module emif_probe(struct platform_device *pdev)
return -ENODEV;
}
static int __exit emif_remove(struct platform_device *pdev)
static void __exit emif_remove(struct platform_device *pdev)
{
struct emif_data *emif = platform_get_drvdata(pdev);
emif_debugfs_exit(emif);
return 0;
}
static void emif_shutdown(struct platform_device *pdev)
@ -1185,7 +1183,7 @@ MODULE_DEVICE_TABLE(of, emif_of_match);
#endif
static struct platform_driver emif_driver = {
.remove = __exit_p(emif_remove),
.remove_new = __exit_p(emif_remove),
.shutdown = emif_shutdown,
.driver = {
.name = "emif",

6
drivers/memory/fsl-corenet-cf.c
View file

@ -223,7 +223,7 @@ static int ccf_probe(struct platform_device *pdev)
return 0;
}
static int ccf_remove(struct platform_device *pdev)
static void ccf_remove(struct platform_device *pdev)
{
struct ccf_private *ccf = dev_get_drvdata(&pdev->dev);
@ -241,8 +241,6 @@ static int ccf_remove(struct platform_device *pdev)
iowrite32be(0, &ccf->err_regs->errinten);
break;
}
return 0;
}
static struct platform_driver ccf_driver = {
@ -251,7 +249,7 @@ static struct platform_driver ccf_driver = {
.of_match_table = ccf_matches,
},
.probe = ccf_probe,
.remove = ccf_remove,
.remove_new = ccf_remove,
};
module_platform_driver(ccf_driver);

6
drivers/memory/fsl_ifc.c
View file

@ -84,7 +84,7 @@ static int fsl_ifc_ctrl_init(struct fsl_ifc_ctrl *ctrl)
return 0;
}
static int fsl_ifc_ctrl_remove(struct platform_device *dev)
static void fsl_ifc_ctrl_remove(struct platform_device *dev)
{
struct fsl_ifc_ctrl *ctrl = dev_get_drvdata(&dev->dev);
@ -98,8 +98,6 @@ static int fsl_ifc_ctrl_remove(struct platform_device *dev)
iounmap(ctrl->gregs);
dev_set_drvdata(&dev->dev, NULL);
return 0;
}
/*
@ -318,7 +316,7 @@ static struct platform_driver fsl_ifc_ctrl_driver = {
.of_match_table = fsl_ifc_match,
},
.probe = fsl_ifc_ctrl_probe,
.remove = fsl_ifc_ctrl_remove,
.remove_new = fsl_ifc_ctrl_remove,
};
static int __init fsl_ifc_init(void)

5
drivers/memory/jz4780-nemc.c
View file

@ -384,12 +384,11 @@ static int jz4780_nemc_probe(struct platform_device *pdev)
return 0;
}
static int jz4780_nemc_remove(struct platform_device *pdev)
static void jz4780_nemc_remove(struct platform_device *pdev)
{
struct jz4780_nemc *nemc = platform_get_drvdata(pdev);
clk_disable_unprepare(nemc->clk);
return 0;
}
static const struct jz_soc_info jz4740_soc_info = {
@ -408,7 +407,7 @@ static const struct of_device_id jz4780_nemc_dt_match[] = {
static struct platform_driver jz4780_nemc_driver = {
.probe = jz4780_nemc_probe,
.remove = jz4780_nemc_remove,
.remove_new = jz4780_nemc_remove,
.driver = {
.name = "jz4780-nemc",
.of_match_table = of_match_ptr(jz4780_nemc_dt_match),

10
drivers/memory/mtk-smi.c
View file

@ -566,14 +566,13 @@ static int mtk_smi_larb_probe(struct platform_device *pdev)
return ret;
}
static int mtk_smi_larb_remove(struct platform_device *pdev)
static void mtk_smi_larb_remove(struct platform_device *pdev)
{
struct mtk_smi_larb *larb = platform_get_drvdata(pdev);
device_link_remove(&pdev->dev, larb->smi_common_dev);
pm_runtime_disable(&pdev->dev);
component_del(&pdev->dev, &mtk_smi_larb_component_ops);
return 0;
}
static int __maybe_unused mtk_smi_larb_resume(struct device *dev)
@ -616,7 +615,7 @@ static const struct dev_pm_ops smi_larb_pm_ops = {
static struct platform_driver mtk_smi_larb_driver = {
.probe = mtk_smi_larb_probe,
.remove = mtk_smi_larb_remove,
.remove_new = mtk_smi_larb_remove,
.driver = {
.name = "mtk-smi-larb",
.of_match_table = mtk_smi_larb_of_ids,
@ -795,14 +794,13 @@ static int mtk_smi_common_probe(struct platform_device *pdev)
return 0;
}
static int mtk_smi_common_remove(struct platform_device *pdev)
static void mtk_smi_common_remove(struct platform_device *pdev)
{
struct mtk_smi *common = dev_get_drvdata(&pdev->dev);
if (common->plat->type == MTK_SMI_GEN2_SUB_COMM)
device_link_remove(&pdev->dev, common->smi_common_dev);
pm_runtime_disable(&pdev->dev);
return 0;
}
static int __maybe_unused mtk_smi_common_resume(struct device *dev)
@ -842,7 +840,7 @@ static const struct dev_pm_ops smi_common_pm_ops = {
static struct platform_driver mtk_smi_common_driver = {
.probe = mtk_smi_common_probe,
.remove = mtk_smi_common_remove,
.remove_new = mtk_smi_common_remove,
.driver = {
.name = "mtk-smi-common",
.of_match_table = mtk_smi_common_of_ids,

6
drivers/memory/omap-gpmc.c
View file

@ -2690,7 +2690,7 @@ static int gpmc_probe(struct platform_device *pdev)
return rc;
}
static int gpmc_remove(struct platform_device *pdev)
static void gpmc_remove(struct platform_device *pdev)
{
int i;
struct gpmc_device *gpmc = platform_get_drvdata(pdev);
@ -2702,8 +2702,6 @@ static int gpmc_remove(struct platform_device *pdev)
gpmc_mem_exit();
pm_runtime_put_sync(&pdev->dev);
pm_runtime_disable(&pdev->dev);
return 0;
}
#ifdef CONFIG_PM_SLEEP
@ -2747,7 +2745,7 @@ MODULE_DEVICE_TABLE(of, gpmc_dt_ids);
static struct platform_driver gpmc_driver = {
.probe = gpmc_probe,
.remove = gpmc_remove,
.remove_new = gpmc_remove,
.driver = {
.name = DEVICE_NAME,
.of_match_table = of_match_ptr(gpmc_dt_ids),

6
drivers/memory/renesas-rpc-if.c
View file

@ -777,13 +777,11 @@ static int rpcif_probe(struct platform_device *pdev)
return 0;
}
static int rpcif_remove(struct platform_device *pdev)
static void rpcif_remove(struct platform_device *pdev)
{
struct rpcif_priv *rpc = platform_get_drvdata(pdev);
platform_device_unregister(rpc->vdev);
return 0;
}
static const struct of_device_id rpcif_of_match[] = {
@ -797,7 +795,7 @@ MODULE_DEVICE_TABLE(of, rpcif_of_match);
static struct platform_driver rpcif_driver = {
.probe = rpcif_probe,
.remove = rpcif_remove,
.remove_new = rpcif_remove,
.driver = {
.name = "rpc-if",
.of_match_table = rpcif_of_match,

6
drivers/memory/samsung/exynos5422-dmc.c
View file

@ -1558,7 +1558,7 @@ static int exynos5_dmc_probe(struct platform_device *pdev)
* clean the device's resources. It just calls explicitly disable function for
* the performance counters.
*/
static int exynos5_dmc_remove(struct platform_device *pdev)
static void exynos5_dmc_remove(struct platform_device *pdev)
{
struct exynos5_dmc *dmc = dev_get_drvdata(&pdev->dev);
@ -1569,8 +1569,6 @@ static int exynos5_dmc_remove(struct platform_device *pdev)
clk_disable_unprepare(dmc->mout_bpll);
clk_disable_unprepare(dmc->fout_bpll);
return 0;
}
static const struct of_device_id exynos5_dmc_of_match[] = {
@ -1581,7 +1579,7 @@ MODULE_DEVICE_TABLE(of, exynos5_dmc_of_match);
static struct platform_driver exynos5_dmc_platdrv = {
.probe = exynos5_dmc_probe,
.remove = exynos5_dmc_remove,
.remove_new = exynos5_dmc_remove,
.driver = {
.name = "exynos5-dmc",
.of_match_table = exynos5_dmc_of_match,

6
drivers/memory/stm32-fmc2-ebi.c
View file

@ -1146,7 +1146,7 @@ static int stm32_fmc2_ebi_probe(struct platform_device *pdev)
return ret;
}
static int stm32_fmc2_ebi_remove(struct platform_device *pdev)
static void stm32_fmc2_ebi_remove(struct platform_device *pdev)
{
struct stm32_fmc2_ebi *ebi = platform_get_drvdata(pdev);
@ -1154,8 +1154,6 @@ static int stm32_fmc2_ebi_remove(struct platform_device *pdev)
stm32_fmc2_ebi_disable_banks(ebi);
stm32_fmc2_ebi_disable(ebi);
clk_disable_unprepare(ebi->clk);
return 0;
}
static int __maybe_unused stm32_fmc2_ebi_suspend(struct device *dev)
@ -1197,7 +1195,7 @@ MODULE_DEVICE_TABLE(of, stm32_fmc2_ebi_match);
static struct platform_driver stm32_fmc2_ebi_driver = {
.probe = stm32_fmc2_ebi_probe,
.remove = stm32_fmc2_ebi_remove,
.remove_new = stm32_fmc2_ebi_remove,
.driver = {
.name = "stm32_fmc2_ebi",
.of_match_table = stm32_fmc2_ebi_match,

6
drivers/memory/tegra/tegra186-emc.c
View file

@ -378,7 +378,7 @@ static int tegra186_emc_probe(struct platform_device *pdev)
return err;
}
static int tegra186_emc_remove(struct platform_device *pdev)
static void tegra186_emc_remove(struct platform_device *pdev)
{
struct tegra_mc *mc = dev_get_drvdata(pdev->dev.parent);
struct tegra186_emc *emc = platform_get_drvdata(pdev);
@ -387,8 +387,6 @@ static int tegra186_emc_remove(struct platform_device *pdev)
mc->bpmp = NULL;
tegra_bpmp_put(emc->bpmp);
return 0;
}
static const struct of_device_id tegra186_emc_of_match[] = {
@ -413,7 +411,7 @@ static struct platform_driver tegra186_emc_driver = {
.sync_state = icc_sync_state,
},
.probe = tegra186_emc_probe,
.remove = tegra186_emc_remove,
.remove_new = tegra186_emc_remove,
};
module_platform_driver(tegra186_emc_driver);

6
drivers/memory/tegra/tegra210-emc-core.c
View file

@ -1985,15 +1985,13 @@ static int tegra210_emc_probe(struct platform_device *pdev)
return err;
}
static int tegra210_emc_remove(struct platform_device *pdev)
static void tegra210_emc_remove(struct platform_device *pdev)
{
struct tegra210_emc *emc = platform_get_drvdata(pdev);
debugfs_remove_recursive(emc->debugfs.root);
tegra210_clk_emc_detach(emc->clk);
of_reserved_mem_device_release(emc->dev);
return 0;
}
static int __maybe_unused tegra210_emc_suspend(struct device *dev)
@ -2053,7 +2051,7 @@ static struct platform_driver tegra210_emc_driver = {
.pm = &tegra210_emc_pm_ops,
},
.probe = tegra210_emc_probe,
.remove = tegra210_emc_remove,
.remove_new = tegra210_emc_remove,
};
module_platform_driver(tegra210_emc_driver);

5
drivers/memory/ti-aemif.c
View file

@ -427,17 +427,16 @@ static int aemif_probe(struct platform_device *pdev)
return ret;
}
static int aemif_remove(struct platform_device *pdev)
static void aemif_remove(struct platform_device *pdev)
{
struct aemif_device *aemif = platform_get_drvdata(pdev);
clk_disable_unprepare(aemif->clk);
return 0;
}
static struct platform_driver aemif_driver = {
.probe = aemif_probe,
.remove = aemif_remove,
.remove_new = aemif_remove,
.driver = {
.name = "ti-aemif",
.of_match_table = of_match_ptr(aemif_of_match),

6
drivers/memory/ti-emif-pm.c
View file

@ -315,15 +315,13 @@ static int ti_emif_probe(struct platform_device *pdev)
return ret;
}
static int ti_emif_remove(struct platform_device *pdev)
static void ti_emif_remove(struct platform_device *pdev)
{
struct ti_emif_data *emif_data = emif_instance;
emif_instance = NULL;
ti_emif_free_sram(emif_data);
return 0;
}
static const struct dev_pm_ops ti_emif_pm_ops = {
@ -332,7 +330,7 @@ static const struct dev_pm_ops ti_emif_pm_ops = {
static struct platform_driver ti_emif_driver = {
.probe = ti_emif_probe,
.remove = ti_emif_remove,
.remove_new = ti_emif_remove,
.driver = {
.name = KBUILD_MODNAME,
.of_match_table = ti_emif_of_match,