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

Commit e885d762 authored by Bruce Allan's avatar Bruce Allan Committed by Jeff Kirsher
Browse files

e1000e: fix sparse warnings with -D__CHECK_ENDIAN__ 



Signed-off-by: default avatarBruce Allan <bruce.w.allan@intel.com>
Tested-by: default avatarAaron Brown <aaron.f.brown@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent a2a5b323

drivers/net/ethernet/intel/e1000e/ethtool.c

+1 −1
Original line number Diff line number Diff line
@@ -553,7 +553,7 @@ static int e1000_set_eeprom(struct net_device *netdev, 
	memcpy(ptr, bytes, eeprom->len);



	for (i = 0; i < last_word - first_word + 1; i++)

		eeprom_buff[i] = cpu_to_le16(eeprom_buff[i]);

		cpu_to_le16s(&eeprom_buff[i]);



	ret_val = e1000_write_nvm(hw, first_word,

				  last_word - first_word + 1, eeprom_buff);

drivers/net/ethernet/intel/e1000e/netdev.c

+8 −7
Original line number Diff line number Diff line
@@ -183,18 +183,18 @@ static void e1000e_dump(struct e1000_adapter *adapter) 
	struct e1000_ring *tx_ring = adapter->tx_ring;

	struct e1000_tx_desc *tx_desc;

	struct my_u0 {

		u64 a;

		u64 b;

		__le64 a;

		__le64 b;

	} *u0;

	struct e1000_buffer *buffer_info;

	struct e1000_ring *rx_ring = adapter->rx_ring;

	union e1000_rx_desc_packet_split *rx_desc_ps;

	union e1000_rx_desc_extended *rx_desc;

	struct my_u1 {

		u64 a;

		u64 b;

		u64 c;

		u64 d;

		__le64 a;

		__le64 b;

		__le64 c;

		__le64 d;

	} *u1;

	u32 staterr;

	int i = 0;
@@ -5963,7 +5963,8 @@ static void e1000_eeprom_checks(struct e1000_adapter *adapter) 
		return;



	ret_val = e1000_read_nvm(hw, NVM_INIT_CONTROL2_REG, 1, &buf);

	if (!ret_val && (!(le16_to_cpu(buf) & (1 << 0)))) {

	le16_to_cpus(&buf);

	if (!ret_val && (!(buf & (1 << 0)))) {

		/* Deep Smart Power Down (DSPD) */

		dev_warn(&adapter->pdev->dev,

			 "Warning: detected DSPD enabled in EEPROM\n");