diff mbox

[08/14] drm/i915: Flatten intel_edp_panel_vdd_on()

Message ID 1408389369-22898-9-git-send-email-ville.syrjala@linux.intel.com (mailing list archive)
State New, archived
Headers show

Commit Message

Ville Syrjälä Aug. 18, 2014, 7:16 p.m. UTC
From: Ville Syrjälä <ville.syrjala@linux.intel.com>

Less pointless indentation is always nice. There will be a bit more
code in this function once the power sequencer locking is fixed.

Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
---
 drivers/gpu/drm/i915/intel_dp.c | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

Comments

Jani Nikula Aug. 19, 2014, 7:30 a.m. UTC | #1
On Mon, 18 Aug 2014, ville.syrjala@linux.intel.com wrote:
> From: Ville Syrjälä <ville.syrjala@linux.intel.com>
>
> Less pointless indentation is always nice. There will be a bit more
> code in this function once the power sequencer locking is fixed.

Reviewed-by: Jani Nikula <jani.nikula@intel.com>

This could be earlier in the series, right?

>
> Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
> ---
>  drivers/gpu/drm/i915/intel_dp.c | 11 +++++++----
>  1 file changed, 7 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
> index 0fb510c..7ae9a9a 100644
> --- a/drivers/gpu/drm/i915/intel_dp.c
> +++ b/drivers/gpu/drm/i915/intel_dp.c
> @@ -1221,11 +1221,14 @@ static bool edp_panel_vdd_on(struct intel_dp *intel_dp)
>  
>  void intel_edp_panel_vdd_on(struct intel_dp *intel_dp)
>  {
> -	if (is_edp(intel_dp)) {
> -		bool vdd = edp_panel_vdd_on(intel_dp);
> +	bool vdd;
>  
> -		WARN(!vdd, "eDP VDD already requested on\n");
> -	}
> +	if (!is_edp(intel_dp))
> +		return;
> +
> +	vdd = edp_panel_vdd_on(intel_dp);
> +
> +	WARN(!vdd, "eDP VDD already requested on\n");
>  }
>  
>  static void edp_panel_vdd_off_sync(struct intel_dp *intel_dp)
> -- 
> 1.8.5.5
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Ville Syrjälä Aug. 19, 2014, 10:49 a.m. UTC | #2
On Tue, Aug 19, 2014 at 10:30:25AM +0300, Jani Nikula wrote:
> On Mon, 18 Aug 2014, ville.syrjala@linux.intel.com wrote:
> > From: Ville Syrjälä <ville.syrjala@linux.intel.com>
> >
> > Less pointless indentation is always nice. There will be a bit more
> > code in this function once the power sequencer locking is fixed.
> 
> Reviewed-by: Jani Nikula <jani.nikula@intel.com>
> 
> This could be earlier in the series, right?

Yeah doens't really matter. Or could even be squashed with the locking
patch.

> 
> >
> > Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
> > ---
> >  drivers/gpu/drm/i915/intel_dp.c | 11 +++++++----
> >  1 file changed, 7 insertions(+), 4 deletions(-)
> >
> > diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
> > index 0fb510c..7ae9a9a 100644
> > --- a/drivers/gpu/drm/i915/intel_dp.c
> > +++ b/drivers/gpu/drm/i915/intel_dp.c
> > @@ -1221,11 +1221,14 @@ static bool edp_panel_vdd_on(struct intel_dp *intel_dp)
> >  
> >  void intel_edp_panel_vdd_on(struct intel_dp *intel_dp)
> >  {
> > -	if (is_edp(intel_dp)) {
> > -		bool vdd = edp_panel_vdd_on(intel_dp);
> > +	bool vdd;
> >  
> > -		WARN(!vdd, "eDP VDD already requested on\n");
> > -	}
> > +	if (!is_edp(intel_dp))
> > +		return;
> > +
> > +	vdd = edp_panel_vdd_on(intel_dp);
> > +
> > +	WARN(!vdd, "eDP VDD already requested on\n");
> >  }
> >  
> >  static void edp_panel_vdd_off_sync(struct intel_dp *intel_dp)
> > -- 
> > 1.8.5.5
> >
> > _______________________________________________
> > Intel-gfx mailing list
> > Intel-gfx@lists.freedesktop.org
> > http://lists.freedesktop.org/mailman/listinfo/intel-gfx
> 
> -- 
> Jani Nikula, Intel Open Source Technology Center
diff mbox

Patch

diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
index 0fb510c..7ae9a9a 100644
--- a/drivers/gpu/drm/i915/intel_dp.c
+++ b/drivers/gpu/drm/i915/intel_dp.c
@@ -1221,11 +1221,14 @@  static bool edp_panel_vdd_on(struct intel_dp *intel_dp)
 
 void intel_edp_panel_vdd_on(struct intel_dp *intel_dp)
 {
-	if (is_edp(intel_dp)) {
-		bool vdd = edp_panel_vdd_on(intel_dp);
+	bool vdd;
 
-		WARN(!vdd, "eDP VDD already requested on\n");
-	}
+	if (!is_edp(intel_dp))
+		return;
+
+	vdd = edp_panel_vdd_on(intel_dp);
+
+	WARN(!vdd, "eDP VDD already requested on\n");
 }
 
 static void edp_panel_vdd_off_sync(struct intel_dp *intel_dp)