diff mbox

[2/2] net: ethernet: renesas: sh_eth: don't open code of_device_get_match_data()

Message ID 1456850284-8336-2-git-send-email-wsa@the-dreams.de (mailing list archive)
State Accepted
Delegated to: Geert Uytterhoeven
Headers show

Commit Message

Wolfram Sang March 1, 2016, 4:37 p.m. UTC 
From: Wolfram Sang <wsa+renesas@sang-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@sang-engineering.com>
---

Tested on a Lager board.

 drivers/net/ethernet/renesas/sh_eth.c | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

Comments

Simon Horman March 2, 2016, 1:21 a.m. UTC | #1 
On Tue, Mar 01, 2016 at 05:37:59PM +0100, Wolfram Sang wrote:
> From: Wolfram Sang <wsa+renesas@sang-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@sang-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
Wolfram Sang March 2, 2016, 6:46 a.m. UTC | #2 
On Wed, Mar 02, 2016 at 10:21:34AM +0900, Simon Horman wrote:
> On Tue, Mar 01, 2016 at 05:37:59PM +0100, Wolfram Sang wrote:
> > From: Wolfram Sang <wsa+renesas@sang-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@sang-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 *

The compiler complains about a const mismatch without the cast. To keep
things simple, I decided to leave the cast.
Simon Horman March 3, 2016, 12:04 a.m. UTC | #3 
On Wed, Mar 02, 2016 at 07:46:24AM +0100, Wolfram Sang wrote:
> On Wed, Mar 02, 2016 at 10:21:34AM +0900, Simon Horman wrote:
> > On Tue, Mar 01, 2016 at 05:37:59PM +0100, Wolfram Sang wrote:
> > > From: Wolfram Sang <wsa+renesas@sang-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@sang-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 *
> 
> The compiler complains about a const mismatch without the cast. To keep
> things simple, I decided to leave the cast.

Ok, that makes sense.

Reviewed-by: Simon Horman <horms+renesas@verge.net.au>
David Miller March 3, 2016, 9:39 p.m. UTC | #4 
From: Wolfram Sang <wsa@the-dreams.de>
Date: Tue,  1 Mar 2016 17:37:59 +0100

> From: Wolfram Sang <wsa+renesas@sang-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@sang-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);

Applied, although mdp->cd should probably be made const.  It is not legal to make
modifications to the objects returned from this interface.
diff mbox

Patch

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);
 
-		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",