wifi: ath9k: remove ath9k_platform_data

Completely unused here in favor of Device Tree based setup. The DT code
in here should currently match what is available with platform files.
Any such lapse can always be added.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
Acked-by: Toke Høiland-Jørgensen <toke@toke.dk>
Signed-off-by: Kalle Valo <quic_kvalo@quicinc.com>
Link: https://patch.msgid.link/20240906195359.6982-4-rosenp@gmail.com

diff --git a/drivers/net/wireless/ath/ath9k/ath9k_pci_owl_loader.c b/drivers/net/wireless/ath/ath9k/ath9k_pci_owl_loader.c
index 004ca5f536bec5e72110e30fd358d0d8968c5140..fe1013a3a58800494e8908f38607a6866a81032f 100644 (file)
--- a/drivers/net/wireless/ath/ath9k/ath9k_pci_owl_loader.c
+++ b/drivers/net/wireless/ath/ath9k/ath9k_pci_owl_loader.c
@@ -18,7 +18,6 @@
 #include <linux/pci.h>
 #include <linux/delay.h>
 #include <linux/platform_device.h>
-#include <linux/ath9k_platform.h>
 #include <linux/nvmem-consumer.h>
 #include <linux/workqueue.h>
 

diff --git a/drivers/net/wireless/ath/ath9k/hw.c b/drivers/net/wireless/ath/ath9k/hw.c
index 04a4b9ea61c3059ca18567446a9cc2d05cfd7b80..36db734c74ae5fe1e51f5eb1767acd90ae0dd2c1 100644 (file)
--- a/drivers/net/wireless/ath/ath9k/hw.c
+++ b/drivers/net/wireless/ath/ath9k/hw.c
@@ -490,7 +490,7 @@ static void ath9k_hw_init_macaddr(struct ath_hw *ah)
        u16 eeval;
        static const u32 EEP_MAC[] = { EEP_MAC_LSW, EEP_MAC_MID, EEP_MAC_MSW };
 
-       /* MAC address may already be loaded via ath9k_platform_data */
+       /* MAC address may already be loaded via NVMEM */
        if (is_valid_ether_addr(common->macaddr))
                return;
 

diff --git a/drivers/net/wireless/ath/ath9k/init.c b/drivers/net/wireless/ath/ath9k/init.c
index 7fad7e75af6a372525667386c3681842685c542a..f9e77c4624d99c7a6f16bf95e40e486ffba3324e 100644 (file)
--- a/drivers/net/wireless/ath/ath9k/init.c
+++ b/drivers/net/wireless/ath/ath9k/init.c
@@ -18,7 +18,6 @@
 
 #include <linux/dma-mapping.h>
 #include <linux/slab.h>
-#include <linux/ath9k_platform.h>
 #include <linux/module.h>
 #include <linux/of.h>
 #include <linux/of_net.h>
@@ -583,8 +582,8 @@ static int ath9k_nvmem_request_eeprom(struct ath_softc *sc)
 
                /* nvmem cell might not be defined, or the nvmem
                 * subsystem isn't included. In this case, follow
-                * the established "just return 0;" convention of
-                * ath9k_init_platform to say:
+                * the established "just return 0;" convention
+                * to say:
                 * "All good. Nothing to see here. Please go on."
                 */
                if (err == -ENOENT || err == -EOPNOTSUPP)
@@ -620,49 +619,6 @@ static int ath9k_nvmem_request_eeprom(struct ath_softc *sc)
        return 0;
 }
 
-static int ath9k_init_platform(struct ath_softc *sc)
-{
-       struct ath9k_platform_data *pdata = sc->dev->platform_data;
-       struct ath_hw *ah = sc->sc_ah;
-       struct ath_common *common = ath9k_hw_common(ah);
-       int ret;
-
-       if (!pdata)
-               return 0;
-
-       if (!pdata->use_eeprom) {
-               ah->ah_flags &= ~AH_USE_EEPROM;
-               ah->gpio_mask = pdata->gpio_mask;
-               ah->gpio_val = pdata->gpio_val;
-               ah->led_pin = pdata->led_pin;
-               ah->is_clk_25mhz = pdata->is_clk_25mhz;
-               ah->get_mac_revision = pdata->get_mac_revision;
-               ah->external_reset = pdata->external_reset;
-               ah->disable_2ghz = pdata->disable_2ghz;
-               ah->disable_5ghz = pdata->disable_5ghz;
-
-               if (!pdata->endian_check)
-                       ah->ah_flags |= AH_NO_EEP_SWAP;
-       }
-
-       if (pdata->eeprom_name) {
-               ret = ath9k_eeprom_request(sc, pdata->eeprom_name);
-               if (ret)
-                       return ret;
-       }
-
-       if (pdata->led_active_high)
-               ah->config.led_active_high = true;
-
-       if (pdata->tx_gain_buffalo)
-               ah->config.tx_gain_buffalo = true;
-
-       if (pdata->macaddr)
-               ether_addr_copy(common->macaddr, pdata->macaddr);
-
-       return 0;
-}
-
 static int ath9k_of_init(struct ath_softc *sc)
 {
        struct device_node *np = sc->dev->of_node;
@@ -748,10 +704,6 @@ static int ath9k_init_softc(u16 devid, struct ath_softc *sc,
         */
        ath9k_init_pcoem_platform(sc);
 
-       ret = ath9k_init_platform(sc);
-       if (ret)
-               return ret;
-
        ret = ath9k_of_init(sc);
        if (ret)
                return ret;

diff --git a/include/linux/ath9k_platform.h b/include/linux/ath9k_platform.h
deleted file mode 100644 (file)
index 76860a4..0000000
--- a/include/linux/ath9k_platform.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright (c) 2008 Atheros Communications Inc.
- * Copyright (c) 2009 Gabor Juhos <juhosg@openwrt.org>
- * Copyright (c) 2009 Imre Kaloz <kaloz@openwrt.org>
- *
- * Permission to use, copy, modify, and/or distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-#ifndef _LINUX_ATH9K_PLATFORM_H
-#define _LINUX_ATH9K_PLATFORM_H
-
-#define ATH9K_PLAT_EEP_MAX_WORDS       2048
-
-struct ath9k_platform_data {
-       const char *eeprom_name;
-
-       u16 eeprom_data[ATH9K_PLAT_EEP_MAX_WORDS];
-       u8 *macaddr;
-
-       int led_pin;
-       u32 gpio_mask;
-       u32 gpio_val;
-
-       u32 bt_active_pin;
-       u32 bt_priority_pin;
-       u32 wlan_active_pin;
-
-       bool endian_check;
-       bool is_clk_25mhz;
-       bool tx_gain_buffalo;
-       bool disable_2ghz;
-       bool disable_5ghz;
-       bool led_active_high;
-
-       int (*get_mac_revision)(void);
-       int (*external_reset)(void);
-
-       bool use_eeprom;
-};
-
-#endif /* _LINUX_ATH9K_PLATFORM_H */