Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 16b110c3 authored by Andrew Morton's avatar Andrew Morton Committed by Jeff Garzik
Browse files

[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: default avatarAndrew Morton <akpm@osdl.org>
parent f04e3f09

drivers/net/tulip/dmfe.c

+3 −2
Original line number Diff line number Diff line
@@ -1802,7 +1802,7 @@ static void dmfe_parse_srom(struct dmfe_board_info * db) 
	if ( ( (int) srom[18] & 0xff) == SROM_V41_CODE) {

		/* SROM V4.01 */

		/* Get NIC support media mode */

		db->NIC_capability = le16_to_cpup(srom + 34);

		db->NIC_capability = le16_to_cpup((__le16 *)srom + 34/2);

		db->PHY_reg4 = 0;

		for (tmp_reg = 1; tmp_reg < 0x10; tmp_reg <<= 1) {

			switch( db->NIC_capability & tmp_reg ) {
@@ -1814,7 +1814,8 @@ static void dmfe_parse_srom(struct dmfe_board_info * db) 
		}



		/* Media Mode Force or not check */

		dmfe_mode = le32_to_cpup(srom + 34) & le32_to_cpup(srom + 36);

		dmfe_mode = le32_to_cpup((__le32 *)srom + 34/4) &

				le32_to_cpup((__le32 *)srom + 36/4);

		switch(dmfe_mode) {

		case 0x4: dmfe_media_mode = DMFE_100MHF; break;	/* 100MHF */

		case 0x2: dmfe_media_mode = DMFE_10MFD; break;	/* 10MFD */