carl9170 firmware: drop noise reading from channel switch response

The driver manually queries the noise values anyway.

Signed-off-by: Christian Lamparter <chunkeey@googlemail.com>

diff --git a/carlfw/src/rf.c b/carlfw/src/rf.c
index be705a7934b49c75f345e8bb41762ac4ba67982a..703bd4281d2492e37a9642e9728bac7ff44cd06e 100644 (file)
--- a/carlfw/src/rf.c
+++ b/carlfw/src/rf.c
@@ -221,15 +221,6 @@ void rf_cmd(const struct carl9170_cmd *cmd, struct carl9170_rsp *resp)
 
        resp->hdr.len = sizeof(struct carl9170_rf_init_result);
        resp->rf_init_res.ret = cpu_to_le32(ret);
-
-       resp->rf_init_res.regs[0] = get(AR9170_PHY_REG_CCA);
-       resp->rf_init_res.regs[3] = get(AR9170_PHY_REG_EXT_CCA);
-
-       resp->rf_init_res.regs[1] = get(AR9170_PHY_REG_CH1_CCA);
-       resp->rf_init_res.regs[4] = get(AR9170_PHY_REG_CH1_EXT_CCA);
-
-       resp->rf_init_res.regs[2] = get(AR9170_PHY_REG_CH2_CCA);
-       resp->rf_init_res.regs[5] = get(AR9170_PHY_REG_CH2_EXT_CCA);
 }
 
 #ifdef CONFIG_CARL9170FW_PSM

diff --git a/include/shared/fwcmd.h b/include/shared/fwcmd.h
index c1879f5815f6bfff2f330fa75e7c45422db4a192..ec8f81051f83efba7ad05950c0f8ad1f633be9a4 100644 (file)
--- a/include/shared/fwcmd.h
+++ b/include/shared/fwcmd.h
@@ -128,9 +128,8 @@ struct carl9170_rf_init {
 
 struct carl9170_rf_init_result {
        __le32          ret;            /* AR9170_PHY_REG_AGC_CONTROL */
-       __le32          regs[6];
 } __packed;
-#define        CARL9170_RF_INIT_RESULT_SIZE    28
+#define        CARL9170_RF_INIT_RESULT_SIZE    4
 
 #define        CARL9170_USB_WATCHDOG_INACTIVE  0
 #define        CARL9170_USB_WATCHDOG_ON_DUTY   1