[PATCH] drm/i915: Remove return; at the end of a function returning void

[PATCH] drm/i915: Remove return; at the end of a function returning void

[Damien Lespiau]

intel_dsi_init() lost its return value in:

  Damien Lespiau <damien.lespiau@intel.com>
  Date:   Wed May 28 12:30:56 2014 +0100

     drm/i915: Make intel_dsi_init() return void

However, I left a return; at the end of the function and, as Jani noticed, it
looks silly.

Suggested-by: Jani Nikula <jani.nikula@linux.intel.com>
Signed-off-by: Damien Lespiau <damien.lespiau@intel.com>
---
 drivers/gpu/drm/i915/intel_dsi.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/drivers/gpu/drm/i915/intel_dsi.c b/drivers/gpu/drm/i915/intel_dsi.c
index 9d789b3..bd89de5 100644
--- a/drivers/gpu/drm/i915/intel_dsi.c
+++ b/drivers/gpu/drm/i915/intel_dsi.c
@@ -759,6 +759,4 @@ err:
 	drm_encoder_cleanup(&intel_encoder->base);
 	kfree(intel_dsi);
 	kfree(intel_connector);
-
-	return;
 }
-- 
1.8.3.1

Re: [PATCH] drm/i915: Remove return; at the end of a function returning void

[Jani Nikula]

On Tue, 03 Jun 2014, Damien Lespiau <damien.lespiau@intel.com> wrote:
> intel_dsi_init() lost its return value in:
>
>   Damien Lespiau <damien.lespiau@intel.com>
>   Date:   Wed May 28 12:30:56 2014 +0100
>
>      drm/i915: Make intel_dsi_init() return void
>
> However, I left a return; at the end of the function and, as Jani noticed, it
> looks silly.

Thanks. R-b and all that if Daniel needs it.

> Suggested-by: Jani Nikula <jani.nikula@linux.intel.com>
> Signed-off-by: Damien Lespiau <damien.lespiau@intel.com>
> ---
>  drivers/gpu/drm/i915/intel_dsi.c | 2 --
>  1 file changed, 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_dsi.c b/drivers/gpu/drm/i915/intel_dsi.c
> index 9d789b3..bd89de5 100644
> --- a/drivers/gpu/drm/i915/intel_dsi.c
> +++ b/drivers/gpu/drm/i915/intel_dsi.c
> @@ -759,6 +759,4 @@ err:
>  	drm_encoder_cleanup(&intel_encoder->base);
>  	kfree(intel_dsi);
>  	kfree(intel_connector);
> -
> -	return;
>  }
> -- 
> 1.8.3.1
>

-- 
Jani Nikula, Intel Open Source Technology Center

Re: [PATCH] drm/i915: Remove return; at the end of a function returning void

[Damien Lespiau]

On Tue, Jun 03, 2014 at 04:35:01PM +0300, Jani Nikula wrote:
> On Tue, 03 Jun 2014, Damien Lespiau <damien.lespiau@intel.com> wrote:
> > intel_dsi_init() lost its return value in:
> >
> >   Damien Lespiau <damien.lespiau@intel.com>
> >   Date:   Wed May 28 12:30:56 2014 +0100
> >
> >      drm/i915: Make intel_dsi_init() return void
> >
> > However, I left a return; at the end of the function and, as Jani noticed, it
> > looks silly.
> 
> Thanks. R-b and all that if Daniel needs it.

If it's not too late to rewrite history, please consider squashing it
with:
	drm/i915: Make intel_dsi_init() return void

-- 
Damien

Re: [PATCH] drm/i915: Remove return; at the end of a function returning void

[Daniel Vetter]

On Tue, Jun 03, 2014 at 02:37:27PM +0100, Damien Lespiau wrote:
> On Tue, Jun 03, 2014 at 04:35:01PM +0300, Jani Nikula wrote:
> > On Tue, 03 Jun 2014, Damien Lespiau <damien.lespiau@intel.com> wrote:
> > > intel_dsi_init() lost its return value in:
> > >
> > >   Damien Lespiau <damien.lespiau@intel.com>
> > >   Date:   Wed May 28 12:30:56 2014 +0100
> > >
> > >      drm/i915: Make intel_dsi_init() return void
> > >
> > > However, I left a return; at the end of the function and, as Jani noticed, it
> > > looks silly.
> > 
> > Thanks. R-b and all that if Daniel needs it.
> 
> If it's not too late to rewrite history, please consider squashing it
> with:
> 	drm/i915: Make intel_dsi_init() return void

History is rectified.
-Daniel
-- 
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch