Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6ae4bb66 authored by Christian Lamparter's avatar Christian Lamparter Committed by John W. Linville
Browse files

carl9170: remove eeprom data injection option 



In the early days, this was a quite useful software
feature for testing different regdomains and chain
configurations without adding debugfs cruft into
the driver. Nowadays, the driver's phy code seems
to be stable and there's no need for it anymore.
Therefore I decided to removed altogether.

Signed-off-by: default avatarChristian Lamparter <chunkeey@googlemail.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent f1249700

drivers/net/wireless/ath/carl9170/carl9170.h

+0 −1
Original line number Original line Diff line number Diff line
@@ -593,7 +593,6 @@ int carl9170_get_noisefloor(struct ar9170 *ar); 




/* FW */

/* FW */

int carl9170_parse_firmware(struct ar9170 *ar);

int carl9170_parse_firmware(struct ar9170 *ar);

int carl9170_fw_fix_eeprom(struct ar9170 *ar);





extern struct ieee80211_rate __carl9170_ratetable[];

extern struct ieee80211_rate __carl9170_ratetable[];

extern int modparam_noht;

extern int modparam_noht;

drivers/net/wireless/ath/carl9170/fw.c

+0 −33
Original line number Original line Diff line number Diff line
@@ -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];

	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)

int carl9170_parse_firmware(struct ar9170 *ar)

{

{

	const struct carl9170fw_desc_head *fw_desc = NULL;

	const struct carl9170fw_desc_head *fw_desc = NULL;

drivers/net/wireless/ath/carl9170/main.c

+0 −4
Original line number Original line Diff line number Diff line
@@ -1934,10 +1934,6 @@ int carl9170_register(struct ar9170 *ar) 
	if (err)

	if (err)

		return err;

		return err;





	err = carl9170_fw_fix_eeprom(ar);

	if (err)

		return err;



	err = carl9170_parse_eeprom(ar);

	err = carl9170_parse_eeprom(ar);

	if (err)

	if (err)

		return err;

		return err;