diff options
author | Andrew Morton <akpm@osdl.org> | 2005-06-20 18:32:59 -0400 |
---|---|---|
committer | Jeff Garzik <jgarzik@pobox.com> | 2005-06-26 18:37:25 -0400 |
commit | 16b110c3fd760620b4a787db6ed512fe531ab1b5 (patch) | |
tree | edcac0ff31103ff53ecb61cb4239785621cba42c | |
parent | f04e3f092a855ce798f274b38712b90d51b73bca (diff) |
[PATCH] dmfe warning fix
drivers/net/tulip/dmfe.c: In function `dmfe_parse_srom':
drivers/net/tulip/dmfe.c:1805: warning: passing arg 1 of `__le16_to_cpup' from incompatible pointer type
drivers/net/tulip/dmfe.c:1817: warning: passing arg 1 of `__le32_to_cpup' from incompatible pointer type
drivers/net/tulip/dmfe.c:1817: warning: passing arg 1 of `__le32_to_cpup' from incompatible pointer type
This is basically a guess:
Cc: Jeff Garzik <jgarzik@pobox.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
-rw-r--r-- | drivers/net/tulip/dmfe.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/net/tulip/dmfe.c b/drivers/net/tulip/dmfe.c index 04539fca270f..7b899702ceb9 100644 --- a/drivers/net/tulip/dmfe.c +++ b/drivers/net/tulip/dmfe.c | |||
@@ -1802,7 +1802,7 @@ static void dmfe_parse_srom(struct dmfe_board_info * db) | |||
1802 | if ( ( (int) srom[18] & 0xff) == SROM_V41_CODE) { | 1802 | if ( ( (int) srom[18] & 0xff) == SROM_V41_CODE) { |
1803 | /* SROM V4.01 */ | 1803 | /* SROM V4.01 */ |
1804 | /* Get NIC support media mode */ | 1804 | /* Get NIC support media mode */ |
1805 | db->NIC_capability = le16_to_cpup(srom + 34); | 1805 | db->NIC_capability = le16_to_cpup((__le16 *)srom + 34/2); |
1806 | db->PHY_reg4 = 0; | 1806 | db->PHY_reg4 = 0; |
1807 | for (tmp_reg = 1; tmp_reg < 0x10; tmp_reg <<= 1) { | 1807 | for (tmp_reg = 1; tmp_reg < 0x10; tmp_reg <<= 1) { |
1808 | switch( db->NIC_capability & tmp_reg ) { | 1808 | switch( db->NIC_capability & tmp_reg ) { |
@@ -1814,7 +1814,8 @@ static void dmfe_parse_srom(struct dmfe_board_info * db) | |||
1814 | } | 1814 | } |
1815 | 1815 | ||
1816 | /* Media Mode Force or not check */ | 1816 | /* Media Mode Force or not check */ |
1817 | dmfe_mode = le32_to_cpup(srom + 34) & le32_to_cpup(srom + 36); | 1817 | dmfe_mode = le32_to_cpup((__le32 *)srom + 34/4) & |
1818 | le32_to_cpup((__le32 *)srom + 36/4); | ||
1818 | switch(dmfe_mode) { | 1819 | switch(dmfe_mode) { |
1819 | case 0x4: dmfe_media_mode = DMFE_100MHF; break; /* 100MHF */ | 1820 | case 0x4: dmfe_media_mode = DMFE_100MHF; break; /* 100MHF */ |
1820 | case 0x2: dmfe_media_mode = DMFE_10MFD; break; /* 10MFD */ | 1821 | case 0x2: dmfe_media_mode = DMFE_10MFD; break; /* 10MFD */ |