Re: [PATCH 1/3] rkisp1: Get rid of unused variable warning

Ezequiel Garcia
2020-04-02T16:31:42Z

On Thu, 2020-04-02 at 10:47 +0100, Robin Murphy wrote:
> On 2020-04-01 10:37 pm, Ezequiel Garcia wrote:
> > If CONFIG_OF is not selected, the compiler will complain:
> >
> > drivers/staging/media/rkisp1/rkisp1-dev.c: In function ‘rkisp1_probe’:
> > drivers/staging/media/rkisp1/rkisp1-dev.c:457:22: warning: unused variable ‘node’ [-Wunused-variable]
> > 457 | struct device_node *node = pdev->dev.of_node;
> >
> > Rework the code slightly and make the compiler happy.
> >
> > Signed-off-by: Ezequiel Garcia <ezequiel@collabora.com>
> > ---
> > drivers/staging/media/rkisp1/rkisp1-dev.c | 3 +--
> > 1 file changed, 1 insertion(+), 2 deletions(-)
> >
> > diff --git a/drivers/staging/media/rkisp1/rkisp1-dev.c b/drivers/staging/media/rkisp1/rkisp1-dev.c
> > index b1b3c058e957..5e7e797aad71 100644
> > --- a/drivers/staging/media/rkisp1/rkisp1-dev.c
> > +++ b/drivers/staging/media/rkisp1/rkisp1-dev.c
> > @@ -454,7 +454,6 @@ static void rkisp1_debug_init(struct rkisp1_device *rkisp1)
> >
> > static int rkisp1_probe(struct platform_device *pdev)
> > {
> > - struct device_node *node = pdev->dev.of_node;
> > const struct rkisp1_match_data *clk_data;
> > const struct of_device_id *match;
> > struct device *dev = &pdev->dev;
> > @@ -463,7 +462,7 @@ static int rkisp1_probe(struct platform_device *pdev)
> > unsigned int i;
> > int ret, irq;
> >
> > - match = of_match_node(rkisp1_of_match, node);
> > + match = of_match_node(rkisp1_of_match, pdev->dev.of_node);
>
> FWIW you could clean up "match" too by using of_device_get_match_data().
>

Ah, that's nicer.

Thanks,
Ezequiel