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

Commit ac390c60 authored by Al Viro's avatar Al Viro Committed by David S. Miller
Browse files

annotate chelsio 



Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
parent 61cf46ad

drivers/net/chelsio/common.h

+1 −1
Original line number Diff line number Diff line
@@ -379,7 +379,7 @@ extern int t1_link_start(struct cphy *phy, struct cmac *mac, struct link_config 
extern const struct board_info *t1_get_board_info(unsigned int board_id);

extern const struct board_info *t1_get_board_info_from_ids(unsigned int devid,

						    unsigned short ssid);

extern int t1_seeprom_read(adapter_t *adapter, u32 addr, u32 *data);

extern int t1_seeprom_read(adapter_t *adapter, u32 addr, __le32 *data);

extern int t1_get_board_rev(adapter_t *adapter, const struct board_info *bi,

		     struct adapter_params *p);

extern int t1_init_hw_modules(adapter_t *adapter);

drivers/net/chelsio/cxgb2.c

+1 −1
Original line number Diff line number Diff line
@@ -814,7 +814,7 @@ static int get_eeprom(struct net_device *dev, struct ethtool_eeprom *e, 


	e->magic = EEPROM_MAGIC(adapter);

	for (i = e->offset & ~3; i < e->offset + e->len; i += sizeof(u32))

		t1_seeprom_read(adapter, i, (u32 *)&buf[i]);

		t1_seeprom_read(adapter, i, (__le32 *)&buf[i]);

	memcpy(data, buf + e->offset, e->len);

	return 0;

}

drivers/net/chelsio/subr.c

+5 −4
Original line number Diff line number Diff line
@@ -563,10 +563,11 @@ struct chelsio_vpd_t { 
 * written to the Control register. The hardware device will set the flag to a

 * one when 4B have been transferred to the Data register.

 */

int t1_seeprom_read(adapter_t *adapter, u32 addr, u32 *data)

int t1_seeprom_read(adapter_t *adapter, u32 addr, __le32 *data)

{

	int i = EEPROM_MAX_POLL;

	u16 val;

	u32 v;



	if (addr >= EEPROMSIZE || (addr & 3))

		return -EINVAL;
@@ -582,8 +583,8 @@ int t1_seeprom_read(adapter_t *adapter, u32 addr, u32 *data) 
		       adapter->name, addr);

		return -EIO;

	}

	pci_read_config_dword(adapter->pdev, A_PCICFG_VPD_DATA, data);

	*data = le32_to_cpu(*data);

	pci_read_config_dword(adapter->pdev, A_PCICFG_VPD_DATA, &v);

	*data = cpu_to_le32(v);

	return 0;

}
@@ -593,7 +594,7 @@ static int t1_eeprom_vpd_get(adapter_t *adapter, struct chelsio_vpd_t *vpd) 


	for (addr = 0; !ret && addr < sizeof(*vpd); addr += sizeof(u32))

		ret = t1_seeprom_read(adapter, addr,

				      (u32 *)((u8 *)vpd + addr));

				      (__le32 *)((u8 *)vpd + addr));



	return ret;

}