netdev - Re: [PATCH 2/2] net: ethernet: renesas: sh_eth: don't open code of_device_get_match

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Date:	Wed, 2 Mar 2016 10:21:34 +0900
From:	Simon Horman <horms@...ge.net.au>
To:	Wolfram Sang <wsa@...-dreams.de>
Cc:	linux-renesas-soc@...r.kernel.org,
	Sergei Shtylyov <sergei.shtylyov@...entembedded.com>,
	netdev@...r.kernel.org
Subject: Re: [PATCH 2/2] net: ethernet: renesas: sh_eth: don't open code
 of_device_get_match_data()

On Tue, Mar 01, 2016 at 05:37:59PM +0100, Wolfram Sang wrote:
> From: Wolfram Sang <wsa+renesas@...g-engineering.com>
> 
> 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 <wsa+renesas@...g-engineering.com>
> ---
> 
> 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