Unverified Commit 4d822032 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'platform-remove-void-soc-for-6.7-rc' of... 

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

Convert drivers/soc to struct platform_driver::remove_new()

This PR contains the patches I sent in the series available at
https://lore.kernel.org/all/20230925095532.1984344-1-u.kleine-koenig@pengutronix.de


that were not yet picked up in next as of next-20231013.

It converts all drivers below drivers/soc to let their remove callback
return void. See commit 5c5a7680 ("platform: Provide a remove
callback that returns no value") for the rationale.

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 55fa358c e77e6e3e

drivers/soc/fsl/dpaa2-console.c

+2 −4
Original line number Diff line number Diff line
@@ -300,12 +300,10 @@ static int dpaa2_console_probe(struct platform_device *pdev) 
	return error;

}



static int dpaa2_console_remove(struct platform_device *pdev)

static void dpaa2_console_remove(struct platform_device *pdev)

{

	misc_deregister(&dpaa2_mc_console_dev);

	misc_deregister(&dpaa2_aiop_console_dev);



	return 0;

}



static const struct of_device_id dpaa2_console_match_table[] = {
@@ -322,7 +320,7 @@ static struct platform_driver dpaa2_console_driver = { 
		   .of_match_table = dpaa2_console_match_table,

		   },

	.probe = dpaa2_console_probe,

	.remove = dpaa2_console_remove,

	.remove_new = dpaa2_console_remove,

};

module_platform_driver(dpaa2_console_driver);

drivers/soc/fsl/qe/qmc.c

+2 −4
Original line number Diff line number Diff line
@@ -1415,7 +1415,7 @@ static int qmc_probe(struct platform_device *pdev) 
	return ret;

}



static int qmc_remove(struct platform_device *pdev)

static void qmc_remove(struct platform_device *pdev)

{

	struct qmc *qmc = platform_get_drvdata(pdev);
@@ -1427,8 +1427,6 @@ static int qmc_remove(struct platform_device *pdev) 


	/* Disconnect the serial from TSA */

	tsa_serial_disconnect(qmc->tsa_serial);



	return 0;

}



static const struct of_device_id qmc_id_table[] = {
@@ -1443,7 +1441,7 @@ static struct platform_driver qmc_driver = { 
		.of_match_table = of_match_ptr(qmc_id_table),

	},

	.probe = qmc_probe,

	.remove = qmc_remove,

	.remove_new = qmc_remove,

};

module_platform_driver(qmc_driver);

drivers/soc/fsl/qe/tsa.c

+2 −3
Original line number Diff line number Diff line
@@ -706,7 +706,7 @@ static int tsa_probe(struct platform_device *pdev) 
	return 0;

}



static int tsa_remove(struct platform_device *pdev)

static void tsa_remove(struct platform_device *pdev)

{

	struct tsa *tsa = platform_get_drvdata(pdev);

	int i;
@@ -729,7 +729,6 @@ static int tsa_remove(struct platform_device *pdev) 
			clk_put(tsa->tdm[i].l1rclk_clk);

		}

	}

	return 0;

}



static const struct of_device_id tsa_id_table[] = {
@@ -744,7 +743,7 @@ static struct platform_driver tsa_driver = { 
		.of_match_table = of_match_ptr(tsa_id_table),

	},

	.probe = tsa_probe,

	.remove = tsa_remove,

	.remove_new = tsa_remove,

};

module_platform_driver(tsa_driver);

drivers/soc/fujitsu/a64fx-diag.c

+2 −4
Original line number Diff line number Diff line
@@ -116,7 +116,7 @@ static int a64fx_diag_probe(struct platform_device *pdev) 
	return 0;

}



static int a64fx_diag_remove(struct platform_device *pdev)

static void a64fx_diag_remove(struct platform_device *pdev)

{

	struct a64fx_diag_priv *priv = platform_get_drvdata(pdev);
@@ -127,8 +127,6 @@ static int a64fx_diag_remove(struct platform_device *pdev) 
		free_nmi(priv->irq, NULL);

	else

		free_irq(priv->irq, NULL);



	return 0;

}



static const struct acpi_device_id a64fx_diag_acpi_match[] = {
@@ -144,7 +142,7 @@ static struct platform_driver a64fx_diag_driver = { 
		.acpi_match_table = ACPI_PTR(a64fx_diag_acpi_match),

	},

	.probe = a64fx_diag_probe,

	.remove = a64fx_diag_remove,

	.remove_new = a64fx_diag_remove,

};



module_platform_driver(a64fx_diag_driver);

drivers/soc/hisilicon/kunpeng_hccs.c

+2 −4
Original line number Diff line number Diff line
@@ -1244,14 +1244,12 @@ static int hccs_probe(struct platform_device *pdev) 
	return rc;

}



static int hccs_remove(struct platform_device *pdev)

static void hccs_remove(struct platform_device *pdev)

{

	struct hccs_dev *hdev = platform_get_drvdata(pdev);



	hccs_remove_topo_dirs(hdev);

	hccs_unregister_pcc_channel(hdev);



	return 0;

}



static const struct acpi_device_id hccs_acpi_match[] = {
@@ -1262,7 +1260,7 @@ MODULE_DEVICE_TABLE(acpi, hccs_acpi_match); 


static struct platform_driver hccs_driver = {

	.probe = hccs_probe,

	.remove = hccs_remove,

	.remove_new = hccs_remove,

	.driver = {

		.name = "kunpeng_hccs",

		.acpi_match_table = hccs_acpi_match,