Eric Lee / linux-smarc-t335x-v3.2

Download as
Browse Code ยป

Commit 16b110c3fd760620b4a787db6ed512fe531ab1b5

Authored by Andrew Morton
Committed by Jeff Garzik
1 parent f04e3f092a
Exists in master and in 4 other branches v3.2_AM335xPSP_04.06.00.11, v3.2_NEWT335xPSP_04.06.00.11, v3.2_SBC_SMARTMEN, v3.2_SMARCT335xPSP_04.06.00.11

[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>

Showing 1 changed file with 3 additions and 2 deletions Side-by-side Diff

drivers/net/tulip/dmfe.c
Diff comments   View file @ 16b110c
... ... @@ -1802,7 +1802,7 @@
1802 1802 if ( ( (int) srom[18] & 0xff) == SROM_V41_CODE) {
1803 1803 /* SROM V4.01 */
1804 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 1806 db->PHY_reg4 = 0;
1807 1807 for (tmp_reg = 1; tmp_reg < 0x10; tmp_reg <<= 1) {
1808 1808 switch( db->NIC_capability & tmp_reg ) {
... ... @@ -1814,7 +1814,8 @@
1814 1814 }
1815 1815  
1816 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 1819 switch(dmfe_mode) {
1819 1820 case 0x4: dmfe_media_mode = DMFE_100MHF; break; /* 100MHF */
1820 1821 case 0x2: dmfe_media_mode = DMFE_10MFD; break; /* 10MFD */