3 files changed, 0 insertions, 38 deletions
diff --git a/drivers/net/wireless/ath/carl9170/carl9170.h b/drivers/net/wireless/ath/carl9170/carl9170.h
index 6cfbb419e2f6..f0f44c30b2f7 100644
--- a/drivers/net/wireless/ath/carl9170/carl9170.h
+++ b/drivers/net/wireless/ath/carl9170/carl9170.h
@@ -593,7 +593,6 @@ int carl9170_get_noisefloor(struct ar9170 *ar);
 /* FW */
 int carl9170_parse_firmware(struct ar9170 *ar);
-int carl9170_fw_fix_eeprom(struct ar9170 *ar);
 extern struct ieee80211_rate __carl9170_ratetable[];
 extern int modparam_noht;
diff --git a/drivers/net/wireless/ath/carl9170/fw.c b/drivers/net/wireless/ath/carl9170/fw.c
index 3de61adacd34..cffde8d9a521 100644
--- a/drivers/net/wireless/ath/carl9170/fw.c
+++ b/drivers/net/wireless/ath/carl9170/fw.c
@@ -389,39 +389,6 @@ carl9170_find_fw_desc(struct ar9170 *ar, const __u8 *fw_data, const size_t len)
        return (void *)&fw_data[scan - found];
 }
-int carl9170_fw_fix_eeprom(struct ar9170 *ar)
-{
-        const struct carl9170fw_fix_desc *fix_desc = NULL;
-        unsigned int i, n, off;
-        u32 *data = (void *)&ar->eeprom;
-        fix_desc = carl9170_fw_find_desc(ar, FIX_MAGIC,
-                sizeof(*fix_desc), CARL9170FW_FIX_DESC_CUR_VER);
-        if (!fix_desc)
-                return 0;
-        n = (le16_to_cpu(fix_desc->head.length) - sizeof(*fix_desc)) /
-            sizeof(struct carl9170fw_fix_entry);
-        for (i = 0; i < n; i++) {
-                off = le32_to_cpu(fix_desc->data[i].address) -
-                      AR9170_EEPROM_START;
-                if (off >= sizeof(struct ar9170_eeprom) || (off & 3)) {
-                        dev_err(&ar->udev->dev, "Skip invalid entry %d\n", i);
-                        continue;
-                }
-                data[off / sizeof(*data)] &=
-                        le32_to_cpu(fix_desc->data[i].mask);
-                data[off / sizeof(*data)] |=
-                        le32_to_cpu(fix_desc->data[i].value);
-        }
-        return 0;
-}
 int carl9170_parse_firmware(struct ar9170 *ar)
 {
        const struct carl9170fw_desc_head *fw_desc = NULL;
diff --git a/drivers/net/wireless/ath/carl9170/main.c b/drivers/net/wireless/ath/carl9170/main.c
index 4dfb0290b43a..6ee7c55f75a8 100644
--- a/drivers/net/wireless/ath/carl9170/main.c
+++ b/drivers/net/wireless/ath/carl9170/main.c
@@ -1934,10 +1934,6 @@ int carl9170_register(struct ar9170 *ar)
        if (err)
                return err;
-        err = carl9170_fw_fix_eeprom(ar);
-        if (err)
-                return err;
        err = carl9170_parse_eeprom(ar);
        if (err)
                return err;

diff --git a/drivers/net/wireless/ath/carl9170/carl9170.h b/drivers/net/wireless/ath/carl9170/carl9170.h index 6cfbb419e2f6..f0f44c30b2f7 100644 --- a/drivers/net/wireless/ath/carl9170/carl9170.h +++ b/drivers/net/wireless/ath/carl9170/carl9170.h
@@ -593,7 +593,6 @@ int carl9170_get_noisefloor(struct ar9170 *ar);
593		593
594	/* FW */	594	/* FW */
595	int carl9170_parse_firmware(struct ar9170 *ar);	595	int carl9170_parse_firmware(struct ar9170 *ar);
596	int carl9170_fw_fix_eeprom(struct ar9170 *ar);
597		596
598	extern struct ieee80211_rate __carl9170_ratetable[];	597	extern struct ieee80211_rate __carl9170_ratetable[];
599	extern int modparam_noht;	598	extern int modparam_noht;


diff --git a/drivers/net/wireless/ath/carl9170/fw.c b/drivers/net/wireless/ath/carl9170/fw.c index 3de61adacd34..cffde8d9a521 100644 --- a/drivers/net/wireless/ath/carl9170/fw.c +++ b/drivers/net/wireless/ath/carl9170/fw.c
@@ -389,39 +389,6 @@ carl9170_find_fw_desc(struct ar9170 ar, const __u8 fw_data, const size_t len)
389	return (void *)&fw_data[scan - found];	389	return (void *)&fw_data[scan - found];
390	}	390	}
391		391
392	int carl9170_fw_fix_eeprom(struct ar9170 *ar)
393	{
394	const struct carl9170fw_fix_desc *fix_desc = NULL;
395	unsigned int i, n, off;
396	u32 data = (void )&ar->eeprom;
397
398	fix_desc = carl9170_fw_find_desc(ar, FIX_MAGIC,
399	sizeof(*fix_desc), CARL9170FW_FIX_DESC_CUR_VER);
400
401	if (!fix_desc)
402	return 0;
403
404	n = (le16_to_cpu(fix_desc->head.length) - sizeof(*fix_desc)) /
405	sizeof(struct carl9170fw_fix_entry);
406
407	for (i = 0; i < n; i++) {
408	off = le32_to_cpu(fix_desc->data[i].address) -
409	AR9170_EEPROM_START;
410
411	if (off >= sizeof(struct ar9170_eeprom) \|\| (off & 3)) {
412	dev_err(&ar->udev->dev, "Skip invalid entry %d\n", i);
413	continue;
414	}
415
416	data[off / sizeof(*data)] &=
417	le32_to_cpu(fix_desc->data[i].mask);
418	data[off / sizeof(*data)] \|=
419	le32_to_cpu(fix_desc->data[i].value);
420	}
421
422	return 0;
423	}
424
425	int carl9170_parse_firmware(struct ar9170 *ar)	392	int carl9170_parse_firmware(struct ar9170 *ar)
426	{	393	{
427	const struct carl9170fw_desc_head *fw_desc = NULL;	394	const struct carl9170fw_desc_head *fw_desc = NULL;


diff --git a/drivers/net/wireless/ath/carl9170/main.c b/drivers/net/wireless/ath/carl9170/main.c index 4dfb0290b43a..6ee7c55f75a8 100644 --- a/drivers/net/wireless/ath/carl9170/main.c +++ b/drivers/net/wireless/ath/carl9170/main.c
@@ -1934,10 +1934,6 @@ int carl9170_register(struct ar9170 *ar)
1934	if (err)	1934	if (err)
1935	return err;	1935	return err;
1936		1936
1937	err = carl9170_fw_fix_eeprom(ar);
1938	if (err)
1939	return err;
1940
1941	err = carl9170_parse_eeprom(ar);	1937	err = carl9170_parse_eeprom(ar);
1942	if (err)	1938	if (err)
1943	return err;	1939	return err;