wifi: mt76: mt7921: convert acpisar and clc pointers to void

Convert acpisar and clc pointers in mt7921_dev structure to void.
This is a preliminary patch to add WiFi7 chipset support

Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
Signed-off-by: Deren Wu <deren.wu@mediatek.com>
Signed-off-by: Felix Fietkau <nbd@nbd.name>

diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/acpi_sar.c b/drivers/net/wireless/mediatek/mt76/mt7921/acpi_sar.c
index 48dd0de..6feea2e 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7921/acpi_sar.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7921/acpi_sar.c
@@ -308,6 +308,7 @@ int mt7921_init_acpi_sar_power(struct mt7921_phy *phy, bool set_default)
 
 u8 mt7921_acpi_get_flags(struct mt7921_phy *phy)
 {
+       struct mt7921_acpi_sar *acpisar = phy->acpisar;
        struct mt7921_asar_fg *fg;
        struct {
                u8 acpi_idx;
@@ -319,10 +320,10 @@ u8 mt7921_acpi_get_flags(struct mt7921_phy *phy)
        u8 flags = BIT(0);
        int i, j;
 
-       if (!phy->acpisar)
+       if (!acpisar)
                return 0;
 
-       fg = phy->acpisar->fg;
+       fg = acpisar->fg;
        if (!fg)
                return flags;
 

diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/mt7921.h b/drivers/net/wireless/mediatek/mt76/mt7921/mt7921.h
index ec98796..2e29a6b 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7921/mt7921.h
+++ b/drivers/net/wireless/mediatek/mt76/mt7921/mt7921.h
@@ -222,10 +222,9 @@ struct mt7921_phy {
        struct sk_buff_head scan_event_list;
        struct delayed_work scan_work;
 #ifdef CONFIG_ACPI
-       struct mt7921_acpi_sar *acpisar;
+       void *acpisar;
 #endif
-
-       struct mt7921_clc *clc[MT7921_CLC_MAX_NUM];
+       void *clc[MT7921_CLC_MAX_NUM];
 
        struct work_struct roc_work;
        struct timer_list roc_timer;