Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

annotate chelsio

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Jeff Garzik <jeff@garzik.org>

authored by

Al Viro and committed by
David S. Miller
ac390c60 61cf46ad

+7 -6
+1 -1
drivers/net/chelsio/common.h
··· 379 379 extern const struct board_info *t1_get_board_info(unsigned int board_id); 380 380 extern const struct board_info *t1_get_board_info_from_ids(unsigned int devid, 381 381 unsigned short ssid); 382 - extern int t1_seeprom_read(adapter_t *adapter, u32 addr, u32 *data); 382 + extern int t1_seeprom_read(adapter_t *adapter, u32 addr, __le32 *data); 383 383 extern int t1_get_board_rev(adapter_t *adapter, const struct board_info *bi, 384 384 struct adapter_params *p); 385 385 extern int t1_init_hw_modules(adapter_t *adapter);
+1 -1
drivers/net/chelsio/cxgb2.c
··· 814 814 815 815 e->magic = EEPROM_MAGIC(adapter); 816 816 for (i = e->offset & ~3; i < e->offset + e->len; i += sizeof(u32)) 817 - t1_seeprom_read(adapter, i, (u32 *)&buf[i]); 817 + t1_seeprom_read(adapter, i, (__le32 *)&buf[i]); 818 818 memcpy(data, buf + e->offset, e->len); 819 819 return 0; 820 820 }
+5 -4
drivers/net/chelsio/subr.c
··· 563 563 * written to the Control register. The hardware device will set the flag to a 564 564 * one when 4B have been transferred to the Data register. 565 565 */ 566 - int t1_seeprom_read(adapter_t *adapter, u32 addr, u32 *data) 566 + int t1_seeprom_read(adapter_t *adapter, u32 addr, __le32 *data) 567 567 { 568 568 int i = EEPROM_MAX_POLL; 569 569 u16 val; 570 + u32 v; 570 571 571 572 if (addr >= EEPROMSIZE || (addr & 3)) 572 573 return -EINVAL; ··· 583 582 adapter->name, addr); 584 583 return -EIO; 585 584 } 586 - pci_read_config_dword(adapter->pdev, A_PCICFG_VPD_DATA, data); 587 - *data = le32_to_cpu(*data); 585 + pci_read_config_dword(adapter->pdev, A_PCICFG_VPD_DATA, &v); 586 + *data = cpu_to_le32(v); 588 587 return 0; 589 588 } 590 589 ··· 594 593 595 594 for (addr = 0; !ret && addr < sizeof(*vpd); addr += sizeof(u32)) 596 595 ret = t1_seeprom_read(adapter, addr, 597 - (u32 *)((u8 *)vpd + addr)); 596 + (__le32 *)((u8 *)vpd + addr)); 598 597 599 598 return ret; 600 599 }