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

Commit 19a42803 authored by Zhu Yi's avatar Zhu Yi Committed by John W. Linville
Browse files

iwmc3200wifi: remove B0 hardware support 



The patch removes B0 hardware support. Nobody is using it anyway.

Signed-off-by: default avatarZhu Yi <yi.zhu@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent fd2c7fe0

drivers/net/wireless/iwmc3200wifi/eeprom.c

+0 −4
Original line number Diff line number Diff line
@@ -156,10 +156,6 @@ int iwm_eeprom_init(struct iwm_priv *iwm) 
		return -ENOMEM;



	for (i = IWM_EEPROM_FIRST; i < IWM_EEPROM_LAST; i++) {

#ifdef CONFIG_IWM_B0_HW_SUPPORT

		if (iwm->conf.hw_b0 && (i >= IWM_EEPROM_INDIRECT_OFFSET))

			break;

#endif

		ret = iwm_eeprom_read(iwm, i);

		if (ret < 0) {

			IWM_ERR(iwm, "Couldn't read eeprom entry #%d: %s\n",

drivers/net/wireless/iwmc3200wifi/fw.c

+0 −6
Original line number Diff line number Diff line
@@ -319,12 +319,6 @@ int iwm_load_fw(struct iwm_priv *iwm) 
	init_calib_map = iwm->conf.calib_map & IWM_CALIB_MAP_INIT_MSK;

	periodic_calib_map = IWM_CALIB_MAP_PER_LMAC(iwm->conf.calib_map);



#ifdef CONFIG_IWM_B0_HW_SUPPORT

	if (iwm->conf.hw_b0) {

		clear_bit(PHY_CALIBRATE_RX_IQ_CMD, &init_calib_map);

		clear_bit(PHY_CALIBRATE_RX_IQ_CMD, &periodic_calib_map);

	}

#endif

	/* Read RX IQ calibration result from EEPROM */

	if (test_bit(PHY_CALIBRATE_RX_IQ_CMD, &init_calib_map)) {

		iwm_store_rxiq_calib_result(iwm);

drivers/net/wireless/iwmc3200wifi/iwm.h

+0 −5
Original line number Diff line number Diff line
@@ -52,8 +52,6 @@ 
#define IWM_COPYRIGHT "Copyright(c) 2009 Intel Corporation"

#define IWM_AUTHOR "<ilw@linux.intel.com>"



#define CONFIG_IWM_B0_HW_SUPPORT	1



#define IWM_SRC_LMAC	UMAC_HDI_IN_SOURCE_FHRX

#define IWM_SRC_UDMA	UMAC_HDI_IN_SOURCE_UDMA

#define IWM_SRC_UMAC	UMAC_HDI_IN_SOURCE_FW
@@ -86,9 +84,6 @@ struct iwm_conf { 
	u8 ibss_channel;



	u8 mac_addr[ETH_ALEN];

#ifdef CONFIG_IWM_B0_HW_SUPPORT

	bool hw_b0;

#endif

};



enum {

drivers/net/wireless/iwmc3200wifi/main.c

+0 −7
Original line number Diff line number Diff line
@@ -515,13 +515,6 @@ static int iwm_channels_init(struct iwm_priv *iwm) 
{

	int ret;



#ifdef CONFIG_IWM_B0_HW_SUPPORT

	if (iwm->conf.hw_b0) {

		IWM_INFO(iwm, "Workaround EEPROM channels for B0 hardware\n");

		return 0;

	}

#endif



	ret = iwm_send_umac_channel_list(iwm);

	if (ret) {

		IWM_ERR(iwm, "Send channel list failed\n");

drivers/net/wireless/iwmc3200wifi/rx.c

+0 −7
Original line number Diff line number Diff line
@@ -924,13 +924,6 @@ static int iwm_ntf_eeprom_proxy(struct iwm_priv *iwm, u8 *buf, 
	if ((hdr_offset + hdr_len) > IWM_EEPROM_LEN)

		return -EINVAL;



#ifdef CONFIG_IWM_B0_HW_SUPPORT

	if (hdr_offset == IWM_EEPROM_SKU_CAP_OFF) {

		if (eeprom_proxy->buf[0] == 0xff)

			iwm->conf.hw_b0 = 1;

	}

#endif



	switch (hdr_type) {

	case IWM_UMAC_CMD_EEPROM_TYPE_READ:

		memcpy(iwm->eeprom + hdr_offset, eeprom_proxy->buf, hdr_len);