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

Commit 42a67c9b authored by Wolfram Sang's avatar Wolfram Sang Committed by David S. Miller
Browse files

net: ethernet: renesas: sh_eth: don't open code of_device_get_match_data() 



This change will also make Coverity happy by avoiding a theoretical NULL
pointer dereference; yet another reason is to use the above helper function
to tighten the code and make it more readable.

Signed-off-by: default avatarWolfram Sang <wsa+renesas@sang-engineering.com>
Reviewed-by: default avatarSimon Horman <horms+renesas@verge.net.au>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent e8668630

drivers/net/ethernet/renesas/sh_eth.c

+3 −7
Original line number Original line Diff line number Diff line
@@ -3061,15 +3061,11 @@ static int sh_eth_drv_probe(struct platform_device *pdev) 
	mdp->ether_link_active_low = pd->ether_link_active_low;

	mdp->ether_link_active_low = pd->ether_link_active_low;





	/* set cpu data */

	/* set cpu data */

	if (id) {

	if (id)

		mdp->cd = (struct sh_eth_cpu_data *)id->driver_data;

		mdp->cd = (struct sh_eth_cpu_data *)id->driver_data;

	} else	{

	else

		const struct of_device_id *match;

		mdp->cd = (struct sh_eth_cpu_data *)of_device_get_match_data(&pdev->dev);





		match = of_match_device(of_match_ptr(sh_eth_match_table),

					&pdev->dev);

		mdp->cd = (struct sh_eth_cpu_data *)match->data;

	}

	mdp->reg_offset = sh_eth_get_register_offset(mdp->cd->register_type);

	mdp->reg_offset = sh_eth_get_register_offset(mdp->cd->register_type);

	if (!mdp->reg_offset) {

	if (!mdp->reg_offset) {

		dev_err(&pdev->dev, "Unknown register type (%d)\n",

		dev_err(&pdev->dev, "Unknown register type (%d)\n",