aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/chelsio/subr.c
diff options
context:
space:
mode:
authorAl Viro <viro@ftp.linux.org.uk>2007-12-22 13:56:33 -0500
committerDavid S. Miller <davem@davemloft.net>2008-01-28 18:10:29 -0500
commitac390c60a833192e87fb09ed8d67f5d1a84306c8 (patch)
treead8c6d74992816c08bfc3959f767b51f0aeada95 /drivers/net/chelsio/subr.c
parent61cf46ad581ba43073d3bcb0be549eb60fbbf9f8 (diff)
annotate chelsio
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to 'drivers/net/chelsio/subr.c')
-rw-r--r--drivers/net/chelsio/subr.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/net/chelsio/subr.c b/drivers/net/chelsio/subr.c
index dc50151bed81..7adf30230c4f 100644
--- a/drivers/net/chelsio/subr.c
+++ b/drivers/net/chelsio/subr.c
@@ -563,10 +563,11 @@ struct chelsio_vpd_t {
563 * written to the Control register. The hardware device will set the flag to a 563 * written to the Control register. The hardware device will set the flag to a
564 * one when 4B have been transferred to the Data register. 564 * one when 4B have been transferred to the Data register.
565 */ 565 */
566int t1_seeprom_read(adapter_t *adapter, u32 addr, u32 *data) 566int t1_seeprom_read(adapter_t *adapter, u32 addr, __le32 *data)
567{ 567{
568 int i = EEPROM_MAX_POLL; 568 int i = EEPROM_MAX_POLL;
569 u16 val; 569 u16 val;
570 u32 v;
570 571
571 if (addr >= EEPROMSIZE || (addr & 3)) 572 if (addr >= EEPROMSIZE || (addr & 3))
572 return -EINVAL; 573 return -EINVAL;
@@ -582,8 +583,8 @@ int t1_seeprom_read(adapter_t *adapter, u32 addr, u32 *data)
582 adapter->name, addr); 583 adapter->name, addr);
583 return -EIO; 584 return -EIO;
584 } 585 }
585 pci_read_config_dword(adapter->pdev, A_PCICFG_VPD_DATA, data); 586 pci_read_config_dword(adapter->pdev, A_PCICFG_VPD_DATA, &v);
586 *data = le32_to_cpu(*data); 587 *data = cpu_to_le32(v);
587 return 0; 588 return 0;
588} 589}
589 590
@@ -593,7 +594,7 @@ static int t1_eeprom_vpd_get(adapter_t *adapter, struct chelsio_vpd_t *vpd)
593 594
594 for (addr = 0; !ret && addr < sizeof(*vpd); addr += sizeof(u32)) 595 for (addr = 0; !ret && addr < sizeof(*vpd); addr += sizeof(u32))
595 ret = t1_seeprom_read(adapter, addr, 596 ret = t1_seeprom_read(adapter, addr,
596 (u32 *)((u8 *)vpd + addr)); 597 (__le32 *)((u8 *)vpd + addr));
597 598
598 return ret; 599 return ret;
599} 600}