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

Commit 58ff6d4d authored by Tomas Winkler's avatar Tomas Winkler Committed by John W. Linville
Browse files

iwlwifi: reverting 'misc wireless annotations' patch for iwlwifi 



This patch revert commit blow that wrongly suppressed sparse warning in
iwlwifi eeprom reading
In addtion it suppresses correctly the iwlwifi eeprom register reading anomaly.

commit 45883ae47a0a4700c0f4716dc75a255cccdc3a76
misc wireless annotations
Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>

Signed-off-by: default avatarTomas Winkler <tomas.winkler@intel.com>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent cfbc35b6

drivers/net/wireless/iwlwifi/iwl3945-base.c

+2 −2
Original line number Diff line number Diff line
@@ -1586,7 +1586,7 @@ static inline int iwl3945_eeprom_acquire_semaphore(struct iwl3945_priv *priv) 
 */

int iwl3945_eeprom_init(struct iwl3945_priv *priv)

{

	__le16 *e = (__le16 *)&priv->eeprom;

	u16 *e = (u16 *)&priv->eeprom;

	u32 gp = iwl3945_read32(priv, CSR_EEPROM_GP);

	u32 r;

	int sz = sizeof(priv->eeprom);
@@ -1629,7 +1629,7 @@ int iwl3945_eeprom_init(struct iwl3945_priv *priv) 
			IWL_ERROR("Time out reading EEPROM[%d]", addr);

			return -ETIMEDOUT;

		}

		e[addr / 2] = cpu_to_le16(r >> 16);

		e[addr / 2] = le16_to_cpu((__force __le16)(r >> 16));

	}



	return 0;

drivers/net/wireless/iwlwifi/iwl4965-base.c

+2 −2
Original line number Diff line number Diff line
@@ -1659,7 +1659,7 @@ static inline void iwl4965_eeprom_release_semaphore(struct iwl4965_priv *priv) 
 */

int iwl4965_eeprom_init(struct iwl4965_priv *priv)

{

	__le16 *e = (__le16 *)&priv->eeprom;

	u16 *e = (u16 *)&priv->eeprom;

	u32 gp = iwl4965_read32(priv, CSR_EEPROM_GP);

	u32 r;

	int sz = sizeof(priv->eeprom);
@@ -1703,7 +1703,7 @@ int iwl4965_eeprom_init(struct iwl4965_priv *priv) 
			rc = -ETIMEDOUT;

			goto done;

		}

		e[addr / 2] = cpu_to_le16(r >> 16);

		e[addr / 2] = le16_to_cpu((__force __le16)(r >> 16));

	}

	rc = 0;