| Message ID | 20220419133723.1394715-2-arnd@kernel.org (mailing list archive) |
|---|---|
| State | Not Applicable |
| Headers | show |
| Series | OMAP1 full multiplatform conversion | expand |
Hello! On 4/19/22 4:36 PM, Arnd Bergmann wrote: > From: Arnd Bergmann <arnd@arndb.de> > > A recent cleanup patch removed the only reference to a local variable > in some configurations. > > Move the variable into the one block it is still used in, inside > of an #ifdef, to avoid this warning. > > Fixes: 9d773f103b89 ("video: fbdev: omapfb: lcd_ams_delta: Make use of the helper function dev_err_probe()") > Signed-off-by: Arnd Bergmann <arnd@arndb.de> > --- > drivers/video/fbdev/omap/lcd_ams_delta.c | 3 +-- > 1 file changed, 1 insertion(+), 2 deletions(-) > > diff --git a/drivers/video/fbdev/omap/lcd_ams_delta.c b/drivers/video/fbdev/omap/lcd_ams_delta.c > index bbf871f9d862..01944ce46aa1 100644 > --- a/drivers/video/fbdev/omap/lcd_ams_delta.c > +++ b/drivers/video/fbdev/omap/lcd_ams_delta.c [...] > @@ -145,7 +144,7 @@ static int ams_delta_panel_probe(struct platform_device *pdev) > &ams_delta_lcd_ops); > > if (IS_ERR(lcd_device)) { > - ret = PTR_ERR(lcd_device); > + int ret = PTR_ERR(lcd_device); How about inserting an empty line after declaration? > dev_err(&pdev->dev, "failed to register device\n"); > return ret; > } MBR, Sergey
On Wed, Apr 20, 2022 at 11:24 AM Sergei Shtylyov <sergei.shtylyov@gmail.com> wrote: > On 4/19/22 4:36 PM, Arnd Bergmann wrote: > > > From: Arnd Bergmann <arnd@arndb.de> > > > > A recent cleanup patch removed the only reference to a local variable > > in some configurations. > > > > Move the variable into the one block it is still used in, inside > > of an #ifdef, to avoid this warning. > > > > Fixes: 9d773f103b89 ("video: fbdev: omapfb: lcd_ams_delta: Make use of the helper function dev_err_probe()") > > Signed-off-by: Arnd Bergmann <arnd@arndb.de> > > --- > > drivers/video/fbdev/omap/lcd_ams_delta.c | 3 +-- > > 1 file changed, 1 insertion(+), 2 deletions(-) > > > > diff --git a/drivers/video/fbdev/omap/lcd_ams_delta.c b/drivers/video/fbdev/omap/lcd_ams_delta.c > > index bbf871f9d862..01944ce46aa1 100644 > > --- a/drivers/video/fbdev/omap/lcd_ams_delta.c > > +++ b/drivers/video/fbdev/omap/lcd_ams_delta.c > [...] > > @@ -145,7 +144,7 @@ static int ams_delta_panel_probe(struct platform_device *pdev) > > &ams_delta_lcd_ops); > > > > if (IS_ERR(lcd_device)) { > > - ret = PTR_ERR(lcd_device); > > + int ret = PTR_ERR(lcd_device); > > How about inserting an empty line after declaration? Ok, done. Arnd
diff --git a/drivers/video/fbdev/omap/lcd_ams_delta.c b/drivers/video/fbdev/omap/lcd_ams_delta.c index bbf871f9d862..01944ce46aa1 100644 --- a/drivers/video/fbdev/omap/lcd_ams_delta.c +++ b/drivers/video/fbdev/omap/lcd_ams_delta.c @@ -128,7 +128,6 @@ static struct lcd_panel ams_delta_panel = { static int ams_delta_panel_probe(struct platform_device *pdev) { struct lcd_device *lcd_device = NULL; - int ret; gpiod_vblen = devm_gpiod_get(&pdev->dev, "vblen", GPIOD_OUT_LOW); if (IS_ERR(gpiod_vblen)) @@ -145,7 +144,7 @@ static int ams_delta_panel_probe(struct platform_device *pdev) &ams_delta_lcd_ops); if (IS_ERR(lcd_device)) { - ret = PTR_ERR(lcd_device); + int ret = PTR_ERR(lcd_device); dev_err(&pdev->dev, "failed to register device\n"); return ret; }