Commit b41f96ec authored by Uwe Kleine-König's avatar Uwe Kleine-König Committed by Kalle Valo
Browse files

wifi: Switch back to struct platform_driver::remove() 



After commit 0edb555a ("platform: Make platform_driver::remove()
return void") .remove() is (again) the right callback to implement for
platform drivers.

Convert all platform drivers below drivers/net/wireless 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.

En passant several whitespace changes are done to make indentation
consistent in the struct initializers.

Signed-off-by: default avatarUwe Kleine-König <u.kleine-koenig@baylibre.com>
Acked-by: default avatarJeff Johnson <quic_jjohnson@quicinc.com>
Acked-by: default avatarToke Høiland-Jørgensen <toke@toke.dk>
Acked-by: default avatarArend van Spriel <arend.vanspriel@broadcom.com>
Acked-by: default avatarJiri Slaby <jirislaby@kernel.org>
Signed-off-by: default avatarKalle Valo <kvalo@kernel.org>
Link: https://patch.msgid.link/20241106170706.38922-2-u.kleine-koenig@baylibre.com
parent 4fa4f049

drivers/net/wireless/ath/ath10k/ahb.c

+4 −4
Original line number Diff line number Diff line
@@ -842,7 +842,7 @@ static struct platform_driver ath10k_ahb_driver = { 
		.of_match_table = ath10k_ahb_of_match,

	},

	.probe = ath10k_ahb_probe,

	.remove_new = ath10k_ahb_remove,

	.remove = ath10k_ahb_remove,

};



int ath10k_ahb_init(void)

drivers/net/wireless/ath/ath10k/snoc.c

+3 −3
Original line number Diff line number Diff line
@@ -1886,7 +1886,7 @@ static void ath10k_snoc_shutdown(struct platform_device *pdev) 


static struct platform_driver ath10k_snoc_driver = {

	.probe = ath10k_snoc_probe,

	.remove_new = ath10k_snoc_remove,

	.remove = ath10k_snoc_remove,

	.shutdown = ath10k_snoc_shutdown,

	.driver = {

		.name = "ath10k_snoc",

drivers/net/wireless/ath/ath11k/ahb.c

+4 −4
Original line number Diff line number Diff line
@@ -1318,7 +1318,7 @@ static struct platform_driver ath11k_ahb_driver = { 
		.of_match_table = ath11k_ahb_of_match,

	},

	.probe = ath11k_ahb_probe,

	.remove_new = ath11k_ahb_remove,

	.remove = ath11k_ahb_remove,

	.shutdown = ath11k_ahb_shutdown,

};

drivers/net/wireless/ath/ath5k/ahb.c

+4 −4
Original line number Diff line number Diff line
@@ -219,7 +219,7 @@ static void ath_ahb_remove(struct platform_device *pdev) 


static struct platform_driver ath_ahb_driver = {

	.probe = ath_ahb_probe,

	.remove_new = ath_ahb_remove,

	.remove = ath_ahb_remove,

	.driver = {

		.name = "ar231x-wmac",

	},

drivers/net/wireless/ath/ath9k/ahb.c

+5 −5
Original line number Diff line number Diff line
@@ -159,7 +159,7 @@ static void ath_ahb_remove(struct platform_device *pdev) 


static struct platform_driver ath_ahb_driver = {

	.probe = ath_ahb_probe,

	.remove_new = ath_ahb_remove,

	.remove = ath_ahb_remove,

	.driver = {

		.name = "ath9k",

	},