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@xxxxxxxxxxxxxxxxxxxx>
> >
> > 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@xxxxxxxxxxxxxxxxxxxx>
> > ---
> >
> > 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.
Attachment:
signature.asc
Description: PGP signature
