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

Commit 444c5f92 authored by Tobias Klauser's avatar Tobias Klauser Committed by David S. Miller
Browse files

net: ethoc: Remove unnecessary #ifdef CONFIG_OF 



For !CONFIG_OF of_get_property() is defined to always return NULL. Thus
there's no need to protect the call to of_get_property() with #ifdef
CONFIG_OF.

Signed-off-by: default avatarTobias Klauser <tklauser@distanz.ch>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 03679a14

drivers/net/ethernet/ethoc.c

+1 −6
Original line number Diff line number Diff line
@@ -1132,10 +1132,6 @@ static int ethoc_probe(struct platform_device *pdev) 
		memcpy(netdev->dev_addr, pdata->hwaddr, IFHWADDRLEN);

		priv->phy_id = pdata->phy_id;

	} else {

		priv->phy_id = -1;



#ifdef CONFIG_OF

		{

		const uint8_t *mac;



		mac = of_get_property(pdev->dev.of_node,
@@ -1143,8 +1139,7 @@ static int ethoc_probe(struct platform_device *pdev) 
				      NULL);

		if (mac)

			memcpy(netdev->dev_addr, mac, IFHWADDRLEN);

		}

#endif

		priv->phy_id = -1;

	}



	/* Check that the given MAC address is valid. If it isn't, read the