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

Commit 63ec3c83 authored by David S. Miller's avatar David S. Miller
Browse files

niu: Remove redundant PHY ID test. 



Reported-by: default avatarThomas Jarosch <thomas.jarosch@intra2net.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent d984e619

drivers/net/ethernet/sun/niu.c

+4 −2
Original line number Diff line number Diff line
@@ -8579,9 +8579,11 @@ static int __devinit phy_record(struct niu_parent *parent, 
	if (dev_id_1 < 0 || dev_id_2 < 0)

		return 0;

	if (type == PHY_TYPE_PMA_PMD || type == PHY_TYPE_PCS) {

		/* Becuase of the NIU_PHY_ID_MASK being applied, the 8704

		 * test covers the 8706 as well.

		 */

		if (((id & NIU_PHY_ID_MASK) != NIU_PHY_ID_BCM8704) &&

		    ((id & NIU_PHY_ID_MASK) != NIU_PHY_ID_MRVL88X2011) &&

		    ((id & NIU_PHY_ID_MASK) != NIU_PHY_ID_BCM8706))

		    ((id & NIU_PHY_ID_MASK) != NIU_PHY_ID_MRVL88X2011))

			return 0;

	} else {

		if ((id & NIU_PHY_ID_MASK) != NIU_PHY_ID_BCM5464R)