From mboxrd@z Thu Jan 1 00:00:00 1970 From: Simon Horman Subject: Re: [PATCH 2/2] net: ethernet: renesas: sh_eth: don't open code of_device_get_match_data() Date: Wed, 2 Mar 2016 10:21:34 +0900 Message-ID: <20160302012134.GB32543@verge.net.au> References: <1456850284-8336-1-git-send-email-wsa@the-dreams.de> <1456850284-8336-2-git-send-email-wsa@the-dreams.de> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Cc: linux-renesas-soc@vger.kernel.org, Sergei Shtylyov , netdev@vger.kernel.org To: Wolfram Sang Return-path: Received: from kirsty.vergenet.net ([202.4.237.240]:53256 "EHLO kirsty.vergenet.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932143AbcCBBVi (ORCPT ); Tue, 1 Mar 2016 20:21:38 -0500 Content-Disposition: inline In-Reply-To: <1456850284-8336-2-git-send-email-wsa@the-dreams.de> Sender: netdev-owner@vger.kernel.org List-ID: On Tue, Mar 01, 2016 at 05:37:59PM +0100, Wolfram Sang wrote: > From: Wolfram Sang > > 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: Wolfram Sang > --- > > Tested on a Lager board. > > drivers/net/ethernet/renesas/sh_eth.c | 10 +++------- > 1 file changed, 3 insertions(+), 7 deletions(-) > > diff --git a/drivers/net/ethernet/renesas/sh_eth.c b/drivers/net/ethernet/renesas/sh_eth.c > index 0a150b2289146f..8b6c07fe3d407d 100644 > --- a/drivers/net/ethernet/renesas/sh_eth.c > +++ b/drivers/net/ethernet/renesas/sh_eth.c > @@ -3056,15 +3056,11 @@ static int sh_eth_drv_probe(struct platform_device *pdev) > mdp->ether_link_active_low = pd->ether_link_active_low; > > /* set cpu data */ > - if (id) { > + if (id) > mdp->cd = (struct sh_eth_cpu_data *)id->driver_data; > - } else { > - const struct of_device_id *match; > + else > + mdp->cd = (struct sh_eth_cpu_data *)of_device_get_match_data(&pdev->dev); Is the cast needed here? of_device_get_match_data returns void * > > - 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); > if (!mdp->reg_offset) { > dev_err(&pdev->dev, "Unknown register type (%d)\n", > -- > 2.7.0