diff mbox series

drm/panel: newvision-nv3052c: Fix build

Message ID 20220409100016.9337-1-paul@crapouillou.net (mailing list archive)
State New, archived
Headers show
Series drm/panel: newvision-nv3052c: Fix build | expand

Commit Message

Paul Cercueil April 9, 2022, 10 a.m. UTC
The driver was compile-tested then rebased on drm-misc-next, and not
compile-tested after the rebase; unfortunately the driver didn't compile
anymore when it hit drm-misc-next.

Fixes: 49956b505c53 ("drm/panel: Add panel driver for NewVision NV3052C based LCDs")
Cc: Christophe Branchereau <cbranchereau@gmail.com>
Cc: kbuild-all <kbuild-all@lists.01.org>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>
Reported-by: kernel test robot <lkp@intel.com>
Signed-off-by: Paul Cercueil <paul@crapouillou.net>
---
 drivers/gpu/drm/panel/panel-newvision-nv3052c.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

Comments

Sam Ravnborg April 18, 2022, 7:07 a.m. UTC | #1
On Sat, Apr 09, 2022 at 11:00:16AM +0100, Paul Cercueil wrote:
> The driver was compile-tested then rebased on drm-misc-next, and not
> compile-tested after the rebase; unfortunately the driver didn't compile
> anymore when it hit drm-misc-next.
> 
> Fixes: 49956b505c53 ("drm/panel: Add panel driver for NewVision NV3052C based LCDs")
> Cc: Christophe Branchereau <cbranchereau@gmail.com>
> Cc: kbuild-all <kbuild-all@lists.01.org>
> Cc: Stephen Rothwell <sfr@canb.auug.org.au>
> Reported-by: kernel test robot <lkp@intel.com>
> Signed-off-by: Paul Cercueil <paul@crapouillou.net>
Acked-by: Sam Ravnborg <sam@ravnborg.org>
> ---
>  drivers/gpu/drm/panel/panel-newvision-nv3052c.c | 4 +---
>  1 file changed, 1 insertion(+), 3 deletions(-)
> 
> diff --git a/drivers/gpu/drm/panel/panel-newvision-nv3052c.c b/drivers/gpu/drm/panel/panel-newvision-nv3052c.c
> index 127bcfdb59df..cf078f0d3cd3 100644
> --- a/drivers/gpu/drm/panel/panel-newvision-nv3052c.c
> +++ b/drivers/gpu/drm/panel/panel-newvision-nv3052c.c
> @@ -416,15 +416,13 @@ static int nv3052c_probe(struct spi_device *spi)
>  	return 0;
>  }
>  
> -static int nv3052c_remove(struct spi_device *spi)
> +static void nv3052c_remove(struct spi_device *spi)
>  {
>  	struct nv3052c *priv = spi_get_drvdata(spi);
>  
>  	drm_panel_remove(&priv->panel);
>  	drm_panel_disable(&priv->panel);
>  	drm_panel_unprepare(&priv->panel);
> -
> -	return 0;
>  }
>  
>  static const struct drm_display_mode ltk035c5444t_modes[] = {
> -- 
> 2.35.1
Dave Airlie April 18, 2022, 8:53 a.m. UTC | #2
On Mon, 18 Apr 2022 at 17:07, Sam Ravnborg <sam@ravnborg.org> wrote:
>
> On Sat, Apr 09, 2022 at 11:00:16AM +0100, Paul Cercueil wrote:
> > The driver was compile-tested then rebased on drm-misc-next, and not
> > compile-tested after the rebase; unfortunately the driver didn't compile
> > anymore when it hit drm-misc-next.
> >
> > Fixes: 49956b505c53 ("drm/panel: Add panel driver for NewVision NV3052C based LCDs")
> > Cc: Christophe Branchereau <cbranchereau@gmail.com>
> > Cc: kbuild-all <kbuild-all@lists.01.org>
> > Cc: Stephen Rothwell <sfr@canb.auug.org.au>
> > Reported-by: kernel test robot <lkp@intel.com>
> > Signed-off-by: Paul Cercueil <paul@crapouillou.net>
> Acked-by: Sam Ravnborg <sam@ravnborg.org>
> > ---

Backmerge drm-next. I fixed this up when I merged this driver in the
merge commit.

Dave.
diff mbox series

Patch

diff --git a/drivers/gpu/drm/panel/panel-newvision-nv3052c.c b/drivers/gpu/drm/panel/panel-newvision-nv3052c.c
index 127bcfdb59df..cf078f0d3cd3 100644
--- a/drivers/gpu/drm/panel/panel-newvision-nv3052c.c
+++ b/drivers/gpu/drm/panel/panel-newvision-nv3052c.c
@@ -416,15 +416,13 @@  static int nv3052c_probe(struct spi_device *spi)
 	return 0;
 }
 
-static int nv3052c_remove(struct spi_device *spi)
+static void nv3052c_remove(struct spi_device *spi)
 {
 	struct nv3052c *priv = spi_get_drvdata(spi);
 
 	drm_panel_remove(&priv->panel);
 	drm_panel_disable(&priv->panel);
 	drm_panel_unprepare(&priv->panel);
-
-	return 0;
 }
 
 static const struct drm_display_mode ltk035c5444t_modes[] = {