* [PATCH] drivers/gpu/drm/i915/intel_display: coding style fixes
@ 2014-05-18 0:24 Robin Schroer
2014-05-19 7:26 ` Daniel Vetter
0 siblings, 1 reply; 2+ messages in thread
From: Robin Schroer @ 2014-05-18 0:24 UTC (permalink / raw)
To: daniel.vetter; +Cc: linux-kernel, dri-devel, intel-gfx
Fixed several switch statements, curly braces, dereference operators
and keywords.
Signed-off-by: Robin Schroer <sulamiification@gmail.com>
---
drivers/gpu/drm/i915/intel_display.c | 18 ++++++++----------
1 file changed, 8 insertions(+), 10 deletions(-)
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index b9256aa..ff21924 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -962,7 +962,7 @@ bool ibx_digital_port_connected(struct drm_i915_private *dev_priv,
u32 bit;
if (HAS_PCH_IBX(dev_priv->dev)) {
- switch(port->port) {
+ switch (port->port) {
case PORT_B:
bit = SDE_PORTB_HOTPLUG;
break;
@@ -976,7 +976,7 @@ bool ibx_digital_port_connected(struct drm_i915_private *dev_priv,
return true;
}
} else {
- switch(port->port) {
+ switch (port->port) {
case PORT_B:
bit = SDE_PORTB_HOTPLUG_CPT;
break;
@@ -3221,9 +3221,8 @@ static void ironlake_fdi_disable(struct drm_crtc *crtc)
udelay(100);
/* Ironlake workaround, disable clock pointer after downing FDI */
- if (HAS_PCH_IBX(dev)) {
+ if (HAS_PCH_IBX(dev))
I915_WRITE(FDI_RX_CHICKEN(pipe), FDI_RX_PHASE_SYNC_POINTER_OVR);
- }
/* still set train pattern 1 */
reg = FDI_TX_CTL(pipe);
@@ -5844,7 +5843,7 @@ static int i9xx_crtc_mode_set(struct drm_crtc *crtc,
} else {
i9xx_update_pll(intel_crtc,
has_reduced_clock ? &reduced_clock : NULL,
- num_connectors);
+ num_connectors);
}
skip_dpll:
@@ -6220,8 +6219,7 @@ static void ironlake_init_pch_refclk(struct drm_device *dev)
if (intel_panel_use_ssc(dev_priv) && can_ssc) {
DRM_DEBUG_KMS("Using SSC on eDP\n");
val |= DREF_CPU_SOURCE_OUTPUT_DOWNSPREAD;
- }
- else
+ } else
val |= DREF_CPU_SOURCE_OUTPUT_NONSPREAD;
} else
val |= DREF_CPU_SOURCE_OUTPUT_DISABLE;
@@ -8844,7 +8842,7 @@ void intel_prepare_page_flip(struct drm_device *dev, int plane)
spin_unlock_irqrestore(&dev->event_lock, flags);
}
-inline static void intel_mark_page_flip_active(struct intel_crtc *intel_crtc)
+static inline void intel_mark_page_flip_active(struct intel_crtc *intel_crtc)
{
/* Ensure that the work item is consistent when activating it ... */
smp_wmb();
@@ -9054,7 +9052,7 @@ static int intel_gen7_queue_flip(struct drm_device *dev,
if (ret)
goto err;
- switch(intel_crtc->plane) {
+ switch (intel_crtc->plane) {
case PLANE_A:
plane_bit = MI_DISPLAY_FLIP_IVB_PLANE_A;
break;
@@ -9333,7 +9331,7 @@ static void intel_modeset_commit_output_state(struct drm_device *dev)
}
static void
-connected_sink_compute_bpp(struct intel_connector * connector,
+connected_sink_compute_bpp(struct intel_connector *connector,
struct intel_crtc_config *pipe_config)
{
int bpp = pipe_config->pipe_bpp;
--
1.9.0
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] drivers/gpu/drm/i915/intel_display: coding style fixes
2014-05-18 0:24 [PATCH] drivers/gpu/drm/i915/intel_display: coding style fixes Robin Schroer
@ 2014-05-19 7:26 ` Daniel Vetter
0 siblings, 0 replies; 2+ messages in thread
From: Daniel Vetter @ 2014-05-19 7:26 UTC (permalink / raw)
To: Robin Schroer; +Cc: daniel.vetter, intel-gfx, linux-kernel, dri-devel
On Sun, May 18, 2014 at 02:24:50AM +0200, Robin Schroer wrote:
> Fixed several switch statements, curly braces, dereference operators
> and keywords.
>
> Signed-off-by: Robin Schroer <sulamiification@gmail.com>
Queued for -next, thanks for the patch.
-Daniel
> ---
> drivers/gpu/drm/i915/intel_display.c | 18 ++++++++----------
> 1 file changed, 8 insertions(+), 10 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
> index b9256aa..ff21924 100644
> --- a/drivers/gpu/drm/i915/intel_display.c
> +++ b/drivers/gpu/drm/i915/intel_display.c
> @@ -962,7 +962,7 @@ bool ibx_digital_port_connected(struct drm_i915_private *dev_priv,
> u32 bit;
>
> if (HAS_PCH_IBX(dev_priv->dev)) {
> - switch(port->port) {
> + switch (port->port) {
> case PORT_B:
> bit = SDE_PORTB_HOTPLUG;
> break;
> @@ -976,7 +976,7 @@ bool ibx_digital_port_connected(struct drm_i915_private *dev_priv,
> return true;
> }
> } else {
> - switch(port->port) {
> + switch (port->port) {
> case PORT_B:
> bit = SDE_PORTB_HOTPLUG_CPT;
> break;
> @@ -3221,9 +3221,8 @@ static void ironlake_fdi_disable(struct drm_crtc *crtc)
> udelay(100);
>
> /* Ironlake workaround, disable clock pointer after downing FDI */
> - if (HAS_PCH_IBX(dev)) {
> + if (HAS_PCH_IBX(dev))
> I915_WRITE(FDI_RX_CHICKEN(pipe), FDI_RX_PHASE_SYNC_POINTER_OVR);
> - }
>
> /* still set train pattern 1 */
> reg = FDI_TX_CTL(pipe);
> @@ -5844,7 +5843,7 @@ static int i9xx_crtc_mode_set(struct drm_crtc *crtc,
> } else {
> i9xx_update_pll(intel_crtc,
> has_reduced_clock ? &reduced_clock : NULL,
> - num_connectors);
> + num_connectors);
> }
>
> skip_dpll:
> @@ -6220,8 +6219,7 @@ static void ironlake_init_pch_refclk(struct drm_device *dev)
> if (intel_panel_use_ssc(dev_priv) && can_ssc) {
> DRM_DEBUG_KMS("Using SSC on eDP\n");
> val |= DREF_CPU_SOURCE_OUTPUT_DOWNSPREAD;
> - }
> - else
> + } else
> val |= DREF_CPU_SOURCE_OUTPUT_NONSPREAD;
> } else
> val |= DREF_CPU_SOURCE_OUTPUT_DISABLE;
> @@ -8844,7 +8842,7 @@ void intel_prepare_page_flip(struct drm_device *dev, int plane)
> spin_unlock_irqrestore(&dev->event_lock, flags);
> }
>
> -inline static void intel_mark_page_flip_active(struct intel_crtc *intel_crtc)
> +static inline void intel_mark_page_flip_active(struct intel_crtc *intel_crtc)
> {
> /* Ensure that the work item is consistent when activating it ... */
> smp_wmb();
> @@ -9054,7 +9052,7 @@ static int intel_gen7_queue_flip(struct drm_device *dev,
> if (ret)
> goto err;
>
> - switch(intel_crtc->plane) {
> + switch (intel_crtc->plane) {
> case PLANE_A:
> plane_bit = MI_DISPLAY_FLIP_IVB_PLANE_A;
> break;
> @@ -9333,7 +9331,7 @@ static void intel_modeset_commit_output_state(struct drm_device *dev)
> }
>
> static void
> -connected_sink_compute_bpp(struct intel_connector * connector,
> +connected_sink_compute_bpp(struct intel_connector *connector,
> struct intel_crtc_config *pipe_config)
> {
> int bpp = pipe_config->pipe_bpp;
> --
> 1.9.0
>
--
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2014-05-19 7:26 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-05-18 0:24 [PATCH] drivers/gpu/drm/i915/intel_display: coding style fixes Robin Schroer
2014-05-19 7:26 ` Daniel Vetter
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox