mirrors
/
linux-stable
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
1
0
Fork 0
Code Issues Releases Wiki Activity

This series converts all drivers below drivers/bus to struct 

platform_driver::remove_new(). See commit 5c5a7680e6 ("platform:
 Provide a remove callback that returns no value") for an extended
 explanation and the eventual goal.
 
 After the initial simplification in commit 864acca580 ("bus: fsl-mc:
 Drop if block with always false condition") all conversations are
 trivial because the remove callbacks all return zero unconditionally.
 -----BEGIN PGP SIGNATURE-----
 
 iQEzBAABCgAdFiEEP4GsaTp6HlmJrf7Tj4D7WH0S/k4FAmVmJvcACgkQj4D7WH0S
 /k5xBwf+N9HkobiVV73FCtI9FLYAo48vdE4AUOIijrJl9ghFUMdw+Qvybp1IR3+1
 W7G9hCbM6Jz4fBBN1JQDqDxKfgdXImPuy5cYvtTf7Ysp46Kcr2P4KGfFoS7RaqU4
 lShQLe5o59M4r1WA1oV7/aCTyHYtONJ5ZamnhSGSk1g/+JRiEBAQuQ9BlV+Co6Gh
 5twIJnjj3laxduouONn36R05tJ1wQJbt2PktyaAbZ0GpYisqyTFf8IMBnEyAi+wD
 wGwOSAI6Pem6BSVG4xusO9cYGv8sgXe1MK794LdH9wjP5SzXwW+l69GVDQzfRRQ8
 bJnOsYn3ZApQ8n4YtU/VnTfmJoLbGQ==
 =fDKx
 -----END PGP SIGNATURE-----
gpgsig -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEiK/NIGsWEZVxh/FrYKtH/8kJUicFAmVwmF0ACgkQYKtH/8kJ
 UiduGRAAlh6ix6z36PnnU7meUZiJN4eZ/o2jY+nf/PNiTvl1zgi6nfz+pUWddiBX
 I2LFNE8mfW88fppE2SEVi8CcSUNl48ebw6g9QpD9Um+M3UX7TrYM+CVOJWcy7fOp
 2C/8gduAZNKAF9QZ2qhQ04Mwy/gX3mOIrmp0ratSQILkIUWG8odTkxun0DL1vTBi
 OVfTLSkE/Nb/bCqhsZwsFyEBZjnSsx2VUOUb/wbwt7shmQlbAUIDTXTHs6i8iBjz
 fhMRPxEMwzGcOsZ26gfwrCZ6HWW4/T58EgiRSu8g50kg7otfQvyaXc13KN1SxCLu
 E0B/6IWcUuq7rCJSp55t+gbH+VIvG2s6SlTucuE+tscbwoBAKz9gu9siu8I4khjg
 loga53sJUp8VNm9oU7K3ZK0E2jluZjmh/LHdqe5enboDCNetRjOhjfOrvxBGMGAm
 hiExTFJrmVDfohYlBcMNdFbIjOymXr4BcGNF+8DEdfwBDGjOmH9eogymBGKfACB1
 bV/9PoyouVk/GCNgd6dd2vmpRa8z4vxO6JobMf0n7l+CoitGOBXnj7+yiMHJUVYD
 Xw4KsF5nuN03hQMtq4no7KlkH2GurE8VY4wl/5nB9nJguPcjtDf9xcKcLpcnjASt
 HGVD4cs+HFOSqx6QzXcqayr3RpEHiDAYlAG4uPFgancKga62RCw=
 =svRu
 -----END PGP SIGNATURE-----

Merge tag 'bus-platform-remove-void' of https://git.pengutronix.de/git/ukl/linux into soc/drivers

This series converts all drivers below drivers/bus to struct
platform_driver::remove_new(). See commit 5c5a7680e6 ("platform:
Provide a remove callback that returns no value") for an extended
explanation and the eventual goal.

After the initial simplification in commit 864acca580 ("bus: fsl-mc:
Drop if block with always false condition") all conversations are
trivial because the remove callbacks all return zero unconditionally.

* tag 'bus-platform-remove-void' of https://git.pengutronix.de/git/ukl/linux:
  bus: ts-nbus: Convert to platform remove callback returning void
  bus: ti-sysc: Convert to platform remove callback returning void
  bus: ti-pwmss: Convert to platform remove callback returning void
  bus: tegra-gmi: Convert to platform remove callback returning void
  bus: tegra-aconnect: Convert to platform remove callback returning void
  bus: sunxi-rsb: Convert to platform remove callback returning void
  bus: sun50i-de2: Convert to platform remove callback returning void
  bus: simple-pm-bus: Convert to platform remove callback returning void
  bus: qcom-ssc-block-bus: Convert to platform remove callback returning void
  bus: omap_l3_smx: Convert to platform remove callback returning void
  bus: omap-ocp2scp: Convert to platform remove callback returning void
  bus: hisi_lpc: Convert to platform remove callback returning void
  bus: fsl-mc: Convert to platform remove callback returning void
  bus: fsl-mc: Drop if block with always false condition

Link: https://lore.kernel.org/r/20231128174927.m46dgp4juig2omci@pengutronix.de
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Arnd Bergmann 2023-12-06 16:50:53 +01:00
parent cb6c44e020 fc540426f7
commit a351940d61
13 changed files with 28 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/bus/fsl-mc/fsl-mc-bus.c
View File

@ -1167,14 +1167,11 @@ error_cleanup_mc_io:
* fsl_mc_bus_remove - callback invoked when the root MC bus is being
* removed
*/
static int fsl_mc_bus_remove(struct platform_device *pdev)
static void fsl_mc_bus_remove(struct platform_device *pdev)
{
struct fsl_mc *mc = platform_get_drvdata(pdev);
struct fsl_mc_io *mc_io;
if (!fsl_mc_is_root_dprc(&mc->root_mc_bus_dev->dev))
return -EINVAL;
mc_io = mc->root_mc_bus_dev->mc_io;
fsl_mc_device_remove(mc->root_mc_bus_dev);
fsl_destroy_mc_io(mc_io);
@ -1190,13 +1187,6 @@ static int fsl_mc_bus_remove(struct platform_device *pdev)
(GCR1_P1_STOP | GCR1_P2_STOP),
mc->fsl_mc_regs + FSL_MC_GCR1);
}
return 0;
}
static void fsl_mc_bus_shutdown(struct platform_device *pdev)
{
fsl_mc_bus_remove(pdev);
}
static const struct of_device_id fsl_mc_bus_match_table[] = {
@ -1220,8 +1210,8 @@ static struct platform_driver fsl_mc_bus_driver = {
.acpi_match_table = fsl_mc_bus_acpi_match_table,
},
.probe = fsl_mc_bus_probe,
.remove = fsl_mc_bus_remove,
.shutdown = fsl_mc_bus_shutdown,
.remove_new = fsl_mc_bus_remove,
.shutdown = fsl_mc_bus_remove,
};
static int fsl_mc_bus_notifier(struct notifier_block *nb,

6
drivers/bus/hisi_lpc.c
View File

@ -657,7 +657,7 @@ static int hisi_lpc_probe(struct platform_device *pdev)
return ret;
}
static int hisi_lpc_remove(struct platform_device *pdev)
static void hisi_lpc_remove(struct platform_device *pdev)
{
struct device *dev = &pdev->dev;
struct hisi_lpc_dev *lpcdev = dev_get_drvdata(dev);
@ -669,8 +669,6 @@ static int hisi_lpc_remove(struct platform_device *pdev)
of_platform_depopulate(dev);
logic_pio_unregister_range(range);
return 0;
}
static const struct of_device_id hisi_lpc_of_match[] = {
@ -691,6 +689,6 @@ static struct platform_driver hisi_lpc_driver = {
.acpi_match_table = hisi_lpc_acpi_match,
},
.probe = hisi_lpc_probe,
.remove = hisi_lpc_remove,
.remove_new = hisi_lpc_remove,
};
builtin_platform_driver(hisi_lpc_driver);

6
drivers/bus/omap-ocp2scp.c
View File

@ -84,12 +84,10 @@ err0:
return ret;
}
static int omap_ocp2scp_remove(struct platform_device *pdev)
static void omap_ocp2scp_remove(struct platform_device *pdev)
{
pm_runtime_disable(&pdev->dev);
device_for_each_child(&pdev->dev, NULL, ocp2scp_remove_devices);
return 0;
}
#ifdef CONFIG_OF
@ -103,7 +101,7 @@ MODULE_DEVICE_TABLE(of, omap_ocp2scp_id_table);
static struct platform_driver omap_ocp2scp_driver = {
.probe = omap_ocp2scp_probe,
.remove = omap_ocp2scp_remove,
.remove_new = omap_ocp2scp_remove,
.driver = {
.name = "omap-ocp2scp",
.of_match_table = of_match_ptr(omap_ocp2scp_id_table),

6
drivers/bus/omap_l3_smx.c
View File

@ -261,7 +261,7 @@ err0:
return ret;
}
static int omap3_l3_remove(struct platform_device *pdev)
static void omap3_l3_remove(struct platform_device *pdev)
{
struct omap3_l3 *l3 = platform_get_drvdata(pdev);
@ -269,13 +269,11 @@ static int omap3_l3_remove(struct platform_device *pdev)
free_irq(l3->debug_irq, l3);
iounmap(l3->rt);
kfree(l3);
return 0;
}
static struct platform_driver omap3_l3_driver = {
.probe = omap3_l3_probe,
.remove = omap3_l3_remove,
.remove_new = omap3_l3_remove,
.driver = {
.name = "omap_l3_smx",
.of_match_table = of_match_ptr(omap3_l3_match),

6
drivers/bus/qcom-ssc-block-bus.c
View File

@ -350,7 +350,7 @@ static int qcom_ssc_block_bus_probe(struct platform_device *pdev)
return 0;
}
static int qcom_ssc_block_bus_remove(struct platform_device *pdev)
static void qcom_ssc_block_bus_remove(struct platform_device *pdev)
{
struct qcom_ssc_block_bus_data *data = platform_get_drvdata(pdev);
@ -363,8 +363,6 @@ static int qcom_ssc_block_bus_remove(struct platform_device *pdev)
qcom_ssc_block_bus_pds_detach(&pdev->dev, data->pds, data->num_pds);
pm_runtime_disable(&pdev->dev);
pm_clk_destroy(&pdev->dev);
return 0;
}
static const struct of_device_id qcom_ssc_block_bus_of_match[] = {
@ -375,7 +373,7 @@ MODULE_DEVICE_TABLE(of, qcom_ssc_block_bus_of_match);
static struct platform_driver qcom_ssc_block_bus_driver = {
.probe = qcom_ssc_block_bus_probe,
.remove = qcom_ssc_block_bus_remove,
.remove_new = qcom_ssc_block_bus_remove,
.driver = {
.name = "qcom-ssc-block-bus",
.of_match_table = qcom_ssc_block_bus_of_match,

7
drivers/bus/simple-pm-bus.c
View File

@ -74,17 +74,16 @@ static int simple_pm_bus_probe(struct platform_device *pdev)
return 0;
}
static int simple_pm_bus_remove(struct platform_device *pdev)
static void simple_pm_bus_remove(struct platform_device *pdev)
{
const void *data = of_device_get_match_data(&pdev->dev);
if (pdev->driver_override || data)
return 0;
return;
dev_dbg(&pdev->dev, "%s\n", __func__);
pm_runtime_disable(&pdev->dev);
return 0;
}
static int simple_pm_bus_runtime_suspend(struct device *dev)
@ -129,7 +128,7 @@ MODULE_DEVICE_TABLE(of, simple_pm_bus_of_match);
static struct platform_driver simple_pm_bus_driver = {
.probe = simple_pm_bus_probe,
.remove = simple_pm_bus_remove,
.remove_new = simple_pm_bus_remove,
.driver = {
.name = "simple-pm-bus",
.of_match_table = simple_pm_bus_of_match,

5
drivers/bus/sun50i-de2.c
View File

@ -24,10 +24,9 @@ static int sun50i_de2_bus_probe(struct platform_device *pdev)
return 0;
}
static int sun50i_de2_bus_remove(struct platform_device *pdev)
static void sun50i_de2_bus_remove(struct platform_device *pdev)
{
sunxi_sram_release(&pdev->dev);
return 0;
}
static const struct of_device_id sun50i_de2_bus_of_match[] = {
@ -37,7 +36,7 @@ static const struct of_device_id sun50i_de2_bus_of_match[] = {
static struct platform_driver sun50i_de2_bus_driver = {
.probe = sun50i_de2_bus_probe,
.remove = sun50i_de2_bus_remove,
.remove_new = sun50i_de2_bus_remove,
.driver = {
.name = "sun50i-de2-bus",
.of_match_table = sun50i_de2_bus_of_match,

6
drivers/bus/sunxi-rsb.c
View File

@ -817,15 +817,13 @@ static int sunxi_rsb_probe(struct platform_device *pdev)
return 0;
}
static int sunxi_rsb_remove(struct platform_device *pdev)
static void sunxi_rsb_remove(struct platform_device *pdev)
{
struct sunxi_rsb *rsb = platform_get_drvdata(pdev);
device_for_each_child(rsb->dev, NULL, sunxi_rsb_remove_devices);
pm_runtime_disable(&pdev->dev);
sunxi_rsb_hw_exit(rsb);
return 0;
}
static const struct dev_pm_ops sunxi_rsb_dev_pm_ops = {
@ -842,7 +840,7 @@ MODULE_DEVICE_TABLE(of, sunxi_rsb_of_match_table);
static struct platform_driver sunxi_rsb_driver = {
.probe = sunxi_rsb_probe,
.remove = sunxi_rsb_remove,
.remove_new = sunxi_rsb_remove,
.driver = {
.name = RSB_CTRL_NAME,
.of_match_table = sunxi_rsb_of_match_table,

6
drivers/bus/tegra-aconnect.c
View File

@ -53,11 +53,9 @@ static int tegra_aconnect_probe(struct platform_device *pdev)
return 0;
}
static int tegra_aconnect_remove(struct platform_device *pdev)
static void tegra_aconnect_remove(struct platform_device *pdev)
{
pm_runtime_disable(&pdev->dev);
return 0;
}
static int tegra_aconnect_runtime_resume(struct device *dev)
@ -106,7 +104,7 @@ MODULE_DEVICE_TABLE(of, tegra_aconnect_of_match);
static struct platform_driver tegra_aconnect_driver = {
.probe = tegra_aconnect_probe,
.remove = tegra_aconnect_remove,
.remove_new = tegra_aconnect_remove,
.driver = {
.name = "tegra-aconnect",
.of_match_table = tegra_aconnect_of_match,

6
drivers/bus/tegra-gmi.c
View File

@ -258,14 +258,12 @@ static int tegra_gmi_probe(struct platform_device *pdev)
return 0;
}
static int tegra_gmi_remove(struct platform_device *pdev)
static void tegra_gmi_remove(struct platform_device *pdev)
{
struct tegra_gmi *gmi = platform_get_drvdata(pdev);
of_platform_depopulate(gmi->dev);
tegra_gmi_disable(gmi);
return 0;
}
static int __maybe_unused tegra_gmi_runtime_resume(struct device *dev)
@ -305,7 +303,7 @@ MODULE_DEVICE_TABLE(of, tegra_gmi_id_table);
static struct platform_driver tegra_gmi_driver = {
.probe = tegra_gmi_probe,
.remove = tegra_gmi_remove,
.remove_new = tegra_gmi_remove,
.driver = {
.name = "tegra-gmi",
.of_match_table = tegra_gmi_id_table,

5
drivers/bus/ti-pwmss.c
View File

@ -33,10 +33,9 @@ static int pwmss_probe(struct platform_device *pdev)
return ret;
}
static int pwmss_remove(struct platform_device *pdev)
static void pwmss_remove(struct platform_device *pdev)
{
pm_runtime_disable(&pdev->dev);
return 0;
}
static struct platform_driver pwmss_driver = {
@ -45,7 +44,7 @@ static struct platform_driver pwmss_driver = {
.of_match_table = pwmss_of_match,
},
.probe = pwmss_probe,
.remove = pwmss_remove,
.remove_new = pwmss_remove,
};
module_platform_driver(pwmss_driver);

6
drivers/bus/ti-sysc.c
View File

@ -3387,7 +3387,7 @@ unprepare:
return error;
}
static int sysc_remove(struct platform_device *pdev)
static void sysc_remove(struct platform_device *pdev)
{
struct sysc *ddata = platform_get_drvdata(pdev);
int error;
@ -3412,8 +3412,6 @@ static int sysc_remove(struct platform_device *pdev)
unprepare:
sysc_unprepare(ddata);
return 0;
}
static const struct of_device_id sysc_match[] = {
@ -3439,7 +3437,7 @@ MODULE_DEVICE_TABLE(of, sysc_match);
static struct platform_driver sysc_driver = {
.probe = sysc_probe,
.remove = sysc_remove,
.remove_new = sysc_remove,
.driver = {
.name = "ti-sysc",
.of_match_table = sysc_match,

6
drivers/bus/ts-nbus.c
View File

@ -331,7 +331,7 @@ static int ts_nbus_probe(struct platform_device *pdev)
return 0;
}
static int ts_nbus_remove(struct platform_device *pdev)
static void ts_nbus_remove(struct platform_device *pdev)
{
struct ts_nbus *ts_nbus = dev_get_drvdata(&pdev->dev);
@ -339,8 +339,6 @@ static int ts_nbus_remove(struct platform_device *pdev)
mutex_lock(&ts_nbus->lock);
pwm_disable(ts_nbus->pwm);
mutex_unlock(&ts_nbus->lock);
return 0;
}
static const struct of_device_id ts_nbus_of_match[] = {
@ -351,7 +349,7 @@ MODULE_DEVICE_TABLE(of, ts_nbus_of_match);
static struct platform_driver ts_nbus_driver = {
.probe = ts_nbus_probe,
.remove = ts_nbus_remove,
.remove_new = ts_nbus_remove,
.driver = {
.name = "ts_nbus",
.of_match_table = ts_nbus_of_match,