Re: [PATCH] drm/i915: Make sure our labels start at column 0

Ville Syrjälä
2015-06-04T16:34:36Z

On Thu, Jun 04, 2015 at 04:56:18PM +0100, Damien Lespiau wrote:
> I noticed one of those and it turned out we have a few lingering around.

Yuck. I'd prefer we got the other way. Consider the following diffs for example:

diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
index 7f6fd85..342509d 100644
--- a/drivers/gpu/drm/i915/intel_dp.c
+++ b/drivers/gpu/drm/i915/intel_dp.c
@@ -942,6 +942,7 @@ out:

pps_unlock(intel_dp);

+ // foo
return ret;
}

diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
index 5901e00..2673347 100644
--- a/drivers/gpu/drm/i915/intel_dp.c
+++ b/drivers/gpu/drm/i915/intel_dp.c
@@ -942,6 +942,7 @@ intel_dp_aux_ch(struct intel_dp *intel_dp,

pps_unlock(intel_dp);

+ // foo
return ret;
}

>
> Signed-off-by: Damien Lespiau <damien.lespiau@intel.com>
> ---
> drivers/gpu/drm/i915/intel_display.c | 4 ++--
> drivers/gpu/drm/i915/intel_sprite.c | 2 +-
> 2 files changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
> index a96f181..2354927 100644
> --- a/drivers/gpu/drm/i915/intel_display.c
> +++ b/drivers/gpu/drm/i915/intel_display.c
> @@ -6980,7 +6980,7 @@ static int i965gm_get_display_clock_speed(struct drm_device *dev)
>
> return DIV_ROUND_CLOSEST(vco, div_table[cdclk_sel]);
>
> - fail:
> +fail:
> DRM_ERROR("Unable to determine CDCLK. HPLL VCO=%u kHz, CFGC=0x%04x\n", vco, tmp);
> return 200000;
> }
> @@ -7021,7 +7021,7 @@ static int g33_get_display_clock_speed(struct drm_device *dev)
>
> return DIV_ROUND_CLOSEST(vco, div_table[cdclk_sel]);
>
> - fail:
> +fail:
> DRM_ERROR("Unable to determine CDCLK. HPLL VCO=%u kHz, CFGC=0x%08x\n", vco, tmp);
> return 190476;
> }
> diff --git a/drivers/gpu/drm/i915/intel_sprite.c b/drivers/gpu/drm/i915/intel_sprite.c
> index 8193a35..f5965fb 100644
> --- a/drivers/gpu/drm/i915/intel_sprite.c
> +++ b/drivers/gpu/drm/i915/intel_sprite.c
> @@ -1189,6 +1189,6 @@ intel_plane_init(struct drm_device *dev, enum pipe pipe, int plane)
>
> drm_plane_helper_add(&intel_plane->base, &intel_plane_helper_funcs);
>
> - out:
> +out:
> return ret;
> }
> --
> 2.1.0
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx

--
Ville Syrjälä
Intel OTC