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

After commit 0edb555a65d1 ("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: Uwe Kleine-König <u.kleine-koenig@baylibre.com>
Acked-by: Jeff Johnson <quic_jjohnson@quicinc.com>
Acked-by: Toke Høiland-Jørgensen <toke@toke.dk>
Acked-by: Arend van Spriel <arend.vanspriel@broadcom.com>
Acked-by: Jiri Slaby <jirislaby@kernel.org>
Signed-off-by: Kalle Valo <kvalo@kernel.org>
Link: https://patch.msgid.link/20241106170706.38922-2-u.kleine-koenig@baylibre.com

diff --git a/drivers/net/wireless/ath/ath10k/ahb.c b/drivers/net/wireless/ath/ath10k/ahb.c
index f0441b3..db9f9eb 100644 (file)
--- a/drivers/net/wireless/ath/ath10k/ahb.c
+++ b/drivers/net/wireless/ath/ath10k/ahb.c
@@ -837,12 +837,12 @@ static void ath10k_ahb_remove(struct platform_device *pdev)
 }
 
 static struct platform_driver ath10k_ahb_driver = {
-       .driver         = {
-               .name   = "ath10k_ahb",
+       .driver = {
+               .name = "ath10k_ahb",
                .of_match_table = ath10k_ahb_of_match,
        },
-       .probe  = ath10k_ahb_probe,
-       .remove_new = ath10k_ahb_remove,
+       .probe = ath10k_ahb_probe,
+       .remove = ath10k_ahb_remove,
 };
 
 int ath10k_ahb_init(void)

diff --git a/drivers/net/wireless/ath/ath10k/snoc.c b/drivers/net/wireless/ath/ath10k/snoc.c
index 0fe47d5..d436a87 100644 (file)
--- a/drivers/net/wireless/ath/ath10k/snoc.c
+++ b/drivers/net/wireless/ath/ath10k/snoc.c
@@ -1885,11 +1885,11 @@ 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,
+       .probe = ath10k_snoc_probe,
+       .remove = ath10k_snoc_remove,
        .shutdown = ath10k_snoc_shutdown,
        .driver = {
-               .name   = "ath10k_snoc",
+               .name = "ath10k_snoc",
                .of_match_table = ath10k_snoc_dt_match,
        },
 };

diff --git a/drivers/net/wireless/ath/ath11k/ahb.c b/drivers/net/wireless/ath/ath11k/ahb.c
index 916402a..f2fc045 100644 (file)
--- a/drivers/net/wireless/ath/ath11k/ahb.c
+++ b/drivers/net/wireless/ath/ath11k/ahb.c
@@ -1313,12 +1313,12 @@ free_resources:
 }
 
 static struct platform_driver ath11k_ahb_driver = {
-       .driver         = {
-               .name   = "ath11k",
+       .driver = {
+               .name = "ath11k",
                .of_match_table = ath11k_ahb_of_match,
        },
-       .probe  = ath11k_ahb_probe,
-       .remove_new = ath11k_ahb_remove,
+       .probe = ath11k_ahb_probe,
+       .remove = ath11k_ahb_remove,
        .shutdown = ath11k_ahb_shutdown,
 };
 

diff --git a/drivers/net/wireless/ath/ath5k/ahb.c b/drivers/net/wireless/ath/ath5k/ahb.c
index f27308c..cb3e891 100644 (file)
--- a/drivers/net/wireless/ath/ath5k/ahb.c
+++ b/drivers/net/wireless/ath/ath5k/ahb.c
@@ -218,10 +218,10 @@ 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,
-       .driver         = {
-               .name   = "ar231x-wmac",
+       .probe = ath_ahb_probe,
+       .remove = ath_ahb_remove,
+       .driver = {
+               .name = "ar231x-wmac",
        },
 };
 

diff --git a/drivers/net/wireless/ath/ath9k/ahb.c b/drivers/net/wireless/ath/ath9k/ahb.c
index 1a6697b..d4805e0 100644 (file)
--- a/drivers/net/wireless/ath/ath9k/ahb.c
+++ b/drivers/net/wireless/ath/ath9k/ahb.c
@@ -158,12 +158,12 @@ 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,
-       .driver         = {
-               .name   = "ath9k",
+       .probe = ath_ahb_probe,
+       .remove = ath_ahb_remove,
+       .driver = {
+               .name = "ath9k",
        },
-       .id_table    = ath9k_platform_id_table,
+       .id_table = ath9k_platform_id_table,
 };
 
 MODULE_DEVICE_TABLE(platform, ath9k_platform_id_table);

diff --git a/drivers/net/wireless/ath/wcn36xx/main.c b/drivers/net/wireless/ath/wcn36xx/main.c
index 4087765..8557d48 100644 (file)
--- a/drivers/net/wireless/ath/wcn36xx/main.c
+++ b/drivers/net/wireless/ath/wcn36xx/main.c
@@ -1679,10 +1679,10 @@ static const struct of_device_id wcn36xx_of_match[] = {
 MODULE_DEVICE_TABLE(of, wcn36xx_of_match);
 
 static struct platform_driver wcn36xx_driver = {
-       .probe      = wcn36xx_probe,
-       .remove_new = wcn36xx_remove,
-       .driver         = {
-               .name   = "wcn36xx",
+       .probe = wcn36xx_probe,
+       .remove = wcn36xx_remove,
+       .driver = {
+               .name = "wcn36xx",
                .of_match_table = wcn36xx_of_match,
        },
 };

diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.c
index 58d5091..cfcf01e 100644 (file)
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.c
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.c
@@ -594,7 +594,7 @@ static void brcmf_common_pd_remove(struct platform_device *pdev)
 }
 
 static struct platform_driver brcmf_pd = {
-       .remove_new     = brcmf_common_pd_remove,
+       .remove         = brcmf_common_pd_remove,
        .driver         = {
                .name   = BRCMFMAC_PDATA_NAME,
        }

diff --git a/drivers/net/wireless/mediatek/mt76/mt7603/soc.c b/drivers/net/wireless/mediatek/mt76/mt7603/soc.c
index ec02148..08590aa 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7603/soc.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7603/soc.c
@@ -71,7 +71,7 @@ MODULE_FIRMWARE(MT7628_FIRMWARE_E2);
 
 struct platform_driver mt76_wmac_driver = {
        .probe          = mt76_wmac_probe,
-       .remove_new     = mt76_wmac_remove,
+       .remove         = mt76_wmac_remove,
        .driver = {
                .name = "mt76_wmac",
                .of_match_table = of_wmac_match,

diff --git a/drivers/net/wireless/mediatek/mt76/mt7615/soc.c b/drivers/net/wireless/mediatek/mt76/mt7615/soc.c
index 12e3e4a..06a0f2a 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7615/soc.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7615/soc.c
@@ -63,7 +63,7 @@ struct platform_driver mt7622_wmac_driver = {
                .of_match_table = mt7622_wmac_of_match,
        },
        .probe = mt7622_wmac_probe,
-       .remove_new = mt7622_wmac_remove,
+       .remove = mt7622_wmac_remove,
 };
 
 MODULE_FIRMWARE(MT7622_FIRMWARE_N9);

diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/soc.c b/drivers/net/wireless/mediatek/mt76/mt7915/soc.c
index 90a6f61..c823a75 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7915/soc.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7915/soc.c
@@ -1303,7 +1303,7 @@ struct platform_driver mt798x_wmac_driver = {
                .of_match_table = mt798x_wmac_of_match,
        },
        .probe = mt798x_wmac_probe,
-       .remove_new = mt798x_wmac_remove,
+       .remove = mt798x_wmac_remove,
 };
 
 MODULE_FIRMWARE(MT7986_FIRMWARE_WA);

diff --git a/drivers/net/wireless/ti/wl12xx/main.c b/drivers/net/wireless/ti/wl12xx/main.c
index b26d42b..ffbf547 100644 (file)
--- a/drivers/net/wireless/ti/wl12xx/main.c
+++ b/drivers/net/wireless/ti/wl12xx/main.c
@@ -1939,7 +1939,7 @@ MODULE_DEVICE_TABLE(platform, wl12xx_id_table);
 
 static struct platform_driver wl12xx_driver = {
        .probe          = wl12xx_probe,
-       .remove_new     = wl12xx_remove,
+       .remove         = wl12xx_remove,
        .id_table       = wl12xx_id_table,
        .driver = {
                .name   = "wl12xx_driver",

diff --git a/drivers/net/wireless/ti/wl18xx/main.c b/drivers/net/wireless/ti/wl18xx/main.c
index 39d8eeb..4be1110 100644 (file)
--- a/drivers/net/wireless/ti/wl18xx/main.c
+++ b/drivers/net/wireless/ti/wl18xx/main.c
@@ -2097,9 +2097,9 @@ MODULE_DEVICE_TABLE(platform, wl18xx_id_table);
 
 static struct platform_driver wl18xx_driver = {
        .probe          = wl18xx_probe,
-       .remove_new     = wlcore_remove,
+       .remove         = wlcore_remove,
        .id_table       = wl18xx_id_table,
-       .driver = {
+       .driver         = {
                .name   = "wl18xx_driver",
        }
 };