leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

annotate chelsio

Browse Source 
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
This commit is contained in:
Al Viro 2007-12-22 18:56:33 +00:00 committed by David S. Miller
parent 61cf46ad58
commit ac390c60a8
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/net/chelsio/common.h
View File

@ -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(unsigned int board_id);
extern const struct board_info *t1_get_board_info_from_ids(unsigned int devid, extern const struct board_info *t1_get_board_info_from_ids(unsigned int devid,
unsigned short ssid); 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, extern int t1_get_board_rev(adapter_t *adapter, const struct board_info *bi,
struct adapter_params *p); struct adapter_params *p);
extern int t1_init_hw_modules(adapter_t *adapter); extern int t1_init_hw_modules(adapter_t *adapter);

2
drivers/net/chelsio/cxgb2.c
View File

@ -814,7 +814,7 @@ static int get_eeprom(struct net_device *dev, struct ethtool_eeprom *e,
e->magic = EEPROM_MAGIC(adapter); e->magic = EEPROM_MAGIC(adapter);
for (i = e->offset & ~3; i < e->offset + e->len; i += sizeof(u32)) 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); memcpy(data, buf + e->offset, e->len);
return 0; return 0;
} }

9
drivers/net/chelsio/subr.c
View File

@ -563,10 +563,11 @@ struct chelsio_vpd_t {
* written to the Control register. The hardware device will set the flag to a * written to the Control register. The hardware device will set the flag to a
* one when 4B have been transferred to the Data register. * 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; int i = EEPROM_MAX_POLL;
u16 val; u16 val;
u32 v;
if (addr >= EEPROMSIZE || (addr & 3)) if (addr >= EEPROMSIZE || (addr & 3))
return -EINVAL; return -EINVAL;
@ -582,8 +583,8 @@ int t1_seeprom_read(adapter_t *adapter, u32 addr, u32 *data)
adapter->name, addr); adapter->name, addr);
return -EIO; return -EIO;
} }
pci_read_config_dword(adapter->pdev, A_PCICFG_VPD_DATA, data); pci_read_config_dword(adapter->pdev, A_PCICFG_VPD_DATA, &v);
*data = le32_to_cpu(*data); *data = cpu_to_le32(v);
return 0; 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)) for (addr = 0; !ret && addr < sizeof(*vpd); addr += sizeof(u32))
ret = t1_seeprom_read(adapter, addr, ret = t1_seeprom_read(adapter, addr,
(u32 *)((u8 *)vpd + addr)); (__le32 *)((u8 *)vpd + addr));
return ret; return ret;
} }