[PATCH 1/7] drm: Miscellaneous checkpatch whitespace cleanups

2014-12-10 Thread Daniel Vetter 
On Wed, Dec 10, 2014 at 01:03:34PM +0100, Thierry Reding wrote:
> From: Thierry Reding 
> 
> A couple of whitespace changes required to silent various errors and
> warnings flagged by checkpatch.
> 
> checkpatch requires that the opening brace be on the same line as a
> variable declaration. Furthermore an empty line is required after a
> block of variable declarations. Trailing whitespace as well as using
> spaces before tabs is considered an error or warning, respectively.
> Finally, the closing parenthesis of an if condition and the opening
> brace of the conditional block should be separated by a space.
> 
> Signed-off-by: Thierry Reding 

Also merged to drm misc. Imo patches 5&6 are a bit too close to a pure
bikeshed so might drop them again if anyone else objects too.
-Daniel

> ---
>  drivers/gpu/drm/drm_crtc.c | 42 --
>  drivers/gpu/drm/drm_irq.c  |  3 ++-
>  2 files changed, 22 insertions(+), 23 deletions(-)
> 
> diff --git a/drivers/gpu/drm/drm_crtc.c b/drivers/gpu/drm/drm_crtc.c
> index 4e35d2f74e0f..6d36c959beb1 100644
> --- a/drivers/gpu/drm/drm_crtc.c
> +++ b/drivers/gpu/drm/drm_crtc.c
> @@ -61,8 +61,8 @@ static struct drm_framebuffer 
> *add_framebuffer_internal(struct drm_device *dev,
>  /*
>   * Global properties
>   */
> -static const struct drm_prop_enum_list drm_dpms_enum_list[] =
> -{{ DRM_MODE_DPMS_ON, "On" },
> +static const struct drm_prop_enum_list drm_dpms_enum_list[] = {
> + { DRM_MODE_DPMS_ON, "On" },
>   { DRM_MODE_DPMS_STANDBY, "Standby" },
>   { DRM_MODE_DPMS_SUSPEND, "Suspend" },
>   { DRM_MODE_DPMS_OFF, "Off" }
> @@ -70,8 +70,7 @@ static const struct drm_prop_enum_list drm_dpms_enum_list[] 
> =
>  
>  DRM_ENUM_NAME_FN(drm_get_dpms_name, drm_dpms_enum_list)
>  
> -static const struct drm_prop_enum_list drm_plane_type_enum_list[] =
> -{
> +static const struct drm_prop_enum_list drm_plane_type_enum_list[] = {
>   { DRM_PLANE_TYPE_OVERLAY, "Overlay" },
>   { DRM_PLANE_TYPE_PRIMARY, "Primary" },
>   { DRM_PLANE_TYPE_CURSOR, "Cursor" },
> @@ -80,8 +79,7 @@ static const struct drm_prop_enum_list 
> drm_plane_type_enum_list[] =
>  /*
>   * Optional properties
>   */
> -static const struct drm_prop_enum_list drm_scaling_mode_enum_list[] =
> -{
> +static const struct drm_prop_enum_list drm_scaling_mode_enum_list[] = {
>   { DRM_MODE_SCALE_NONE, "None" },
>   { DRM_MODE_SCALE_FULLSCREEN, "Full" },
>   { DRM_MODE_SCALE_CENTER, "Center" },
> @@ -97,8 +95,7 @@ static const struct drm_prop_enum_list 
> drm_aspect_ratio_enum_list[] = {
>  /*
>   * Non-global properties, but "required" for certain connectors.
>   */
> -static const struct drm_prop_enum_list drm_dvi_i_select_enum_list[] =
> -{
> +static const struct drm_prop_enum_list drm_dvi_i_select_enum_list[] = {
>   { DRM_MODE_SUBCONNECTOR_Automatic, "Automatic" }, /* DVI-I and TV-out */
>   { DRM_MODE_SUBCONNECTOR_DVID,  "DVI-D" }, /* DVI-I  */
>   { DRM_MODE_SUBCONNECTOR_DVIA,  "DVI-A" }, /* DVI-I  */
> @@ -106,8 +103,7 @@ static const struct drm_prop_enum_list 
> drm_dvi_i_select_enum_list[] =
>  
>  DRM_ENUM_NAME_FN(drm_get_dvi_i_select_name, drm_dvi_i_select_enum_list)
>  
> -static const struct drm_prop_enum_list drm_dvi_i_subconnector_enum_list[] =
> -{
> +static const struct drm_prop_enum_list drm_dvi_i_subconnector_enum_list[] = {
>   { DRM_MODE_SUBCONNECTOR_Unknown,   "Unknown"   }, /* DVI-I and TV-out */
>   { DRM_MODE_SUBCONNECTOR_DVID,  "DVI-D" }, /* DVI-I  */
>   { DRM_MODE_SUBCONNECTOR_DVIA,  "DVI-A" }, /* DVI-I  */
> @@ -116,8 +112,7 @@ static const struct drm_prop_enum_list 
> drm_dvi_i_subconnector_enum_list[] =
>  DRM_ENUM_NAME_FN(drm_get_dvi_i_subconnector_name,
>drm_dvi_i_subconnector_enum_list)
>  
> -static const struct drm_prop_enum_list drm_tv_select_enum_list[] =
> -{
> +static const struct drm_prop_enum_list drm_tv_select_enum_list[] = {
>   { DRM_MODE_SUBCONNECTOR_Automatic, "Automatic" }, /* DVI-I and TV-out */
>   { DRM_MODE_SUBCONNECTOR_Composite, "Composite" }, /* TV-out */
>   { DRM_MODE_SUBCONNECTOR_SVIDEO,"SVIDEO"}, /* TV-out */
> @@ -127,8 +122,7 @@ static const struct drm_prop_enum_list 
> drm_tv_select_enum_list[] =
>  
>  DRM_ENUM_NAME_FN(drm_get_tv_select_name, drm_tv_select_enum_list)
>  
> -static const struct drm_prop_enum_list drm_tv_subconnector_enum_list[] =
> -{
> +static const struct drm_prop_enum_list drm_tv_subconnector_enum_list[] = {
>   { DRM_MODE_SUBCONNECTOR_Unknown,   "Unknown"   }, /* DVI-I and TV-out */
>   { DRM_MODE_SUBCONNECTOR_Composite, "Composite" }, /* TV-out */
>   { DRM_MODE_SUBCONNECTOR_SVIDEO,"SVIDEO"}, /* TV-out */
> @@ -154,8 +148,8 @@ struct drm_conn_prop_enum_list {
>  /*
>   * Connector and encoder types.
>   */
> -static struct drm_conn_prop_enum_list drm_connector_enum_list[] =
> -{{ DRM_MODE_CONNECTOR_Unknown, "Unknown" },
> +static struct drm_conn_prop_enum_list

[PATCH 1/7] drm: Miscellaneous checkpatch whitespace cleanups

2014-12-10 Thread Thierry Reding 
From: Thierry Reding 

A couple of whitespace changes required to silent various errors and
warnings flagged by checkpatch.

checkpatch requires that the opening brace be on the same line as a
variable declaration. Furthermore an empty line is required after a
block of variable declarations. Trailing whitespace as well as using
spaces before tabs is considered an error or warning, respectively.
Finally, the closing parenthesis of an if condition and the opening
brace of the conditional block should be separated by a space.

Signed-off-by: Thierry Reding 
---
 drivers/gpu/drm/drm_crtc.c | 42 --
 drivers/gpu/drm/drm_irq.c  |  3 ++-
 2 files changed, 22 insertions(+), 23 deletions(-)

diff --git a/drivers/gpu/drm/drm_crtc.c b/drivers/gpu/drm/drm_crtc.c
index 4e35d2f74e0f..6d36c959beb1 100644
--- a/drivers/gpu/drm/drm_crtc.c
+++ b/drivers/gpu/drm/drm_crtc.c
@@ -61,8 +61,8 @@ static struct drm_framebuffer 
*add_framebuffer_internal(struct drm_device *dev,
 /*
  * Global properties
  */
-static const struct drm_prop_enum_list drm_dpms_enum_list[] =
-{  { DRM_MODE_DPMS_ON, "On" },
+static const struct drm_prop_enum_list drm_dpms_enum_list[] = {
+   { DRM_MODE_DPMS_ON, "On" },
{ DRM_MODE_DPMS_STANDBY, "Standby" },
{ DRM_MODE_DPMS_SUSPEND, "Suspend" },
{ DRM_MODE_DPMS_OFF, "Off" }
@@ -70,8 +70,7 @@ static const struct drm_prop_enum_list drm_dpms_enum_list[] =

 DRM_ENUM_NAME_FN(drm_get_dpms_name, drm_dpms_enum_list)

-static const struct drm_prop_enum_list drm_plane_type_enum_list[] =
-{
+static const struct drm_prop_enum_list drm_plane_type_enum_list[] = {
{ DRM_PLANE_TYPE_OVERLAY, "Overlay" },
{ DRM_PLANE_TYPE_PRIMARY, "Primary" },
{ DRM_PLANE_TYPE_CURSOR, "Cursor" },
@@ -80,8 +79,7 @@ static const struct drm_prop_enum_list 
drm_plane_type_enum_list[] =
 /*
  * Optional properties
  */
-static const struct drm_prop_enum_list drm_scaling_mode_enum_list[] =
-{
+static const struct drm_prop_enum_list drm_scaling_mode_enum_list[] = {
{ DRM_MODE_SCALE_NONE, "None" },
{ DRM_MODE_SCALE_FULLSCREEN, "Full" },
{ DRM_MODE_SCALE_CENTER, "Center" },
@@ -97,8 +95,7 @@ static const struct drm_prop_enum_list 
drm_aspect_ratio_enum_list[] = {
 /*
  * Non-global properties, but "required" for certain connectors.
  */
-static const struct drm_prop_enum_list drm_dvi_i_select_enum_list[] =
-{
+static const struct drm_prop_enum_list drm_dvi_i_select_enum_list[] = {
{ DRM_MODE_SUBCONNECTOR_Automatic, "Automatic" }, /* DVI-I and TV-out */
{ DRM_MODE_SUBCONNECTOR_DVID,  "DVI-D" }, /* DVI-I  */
{ DRM_MODE_SUBCONNECTOR_DVIA,  "DVI-A" }, /* DVI-I  */
@@ -106,8 +103,7 @@ static const struct drm_prop_enum_list 
drm_dvi_i_select_enum_list[] =

 DRM_ENUM_NAME_FN(drm_get_dvi_i_select_name, drm_dvi_i_select_enum_list)

-static const struct drm_prop_enum_list drm_dvi_i_subconnector_enum_list[] =
-{
+static const struct drm_prop_enum_list drm_dvi_i_subconnector_enum_list[] = {
{ DRM_MODE_SUBCONNECTOR_Unknown,   "Unknown"   }, /* DVI-I and TV-out */
{ DRM_MODE_SUBCONNECTOR_DVID,  "DVI-D" }, /* DVI-I  */
{ DRM_MODE_SUBCONNECTOR_DVIA,  "DVI-A" }, /* DVI-I  */
@@ -116,8 +112,7 @@ static const struct drm_prop_enum_list 
drm_dvi_i_subconnector_enum_list[] =
 DRM_ENUM_NAME_FN(drm_get_dvi_i_subconnector_name,
 drm_dvi_i_subconnector_enum_list)

-static const struct drm_prop_enum_list drm_tv_select_enum_list[] =
-{
+static const struct drm_prop_enum_list drm_tv_select_enum_list[] = {
{ DRM_MODE_SUBCONNECTOR_Automatic, "Automatic" }, /* DVI-I and TV-out */
{ DRM_MODE_SUBCONNECTOR_Composite, "Composite" }, /* TV-out */
{ DRM_MODE_SUBCONNECTOR_SVIDEO,"SVIDEO"}, /* TV-out */
@@ -127,8 +122,7 @@ static const struct drm_prop_enum_list 
drm_tv_select_enum_list[] =

 DRM_ENUM_NAME_FN(drm_get_tv_select_name, drm_tv_select_enum_list)

-static const struct drm_prop_enum_list drm_tv_subconnector_enum_list[] =
-{
+static const struct drm_prop_enum_list drm_tv_subconnector_enum_list[] = {
{ DRM_MODE_SUBCONNECTOR_Unknown,   "Unknown"   }, /* DVI-I and TV-out */
{ DRM_MODE_SUBCONNECTOR_Composite, "Composite" }, /* TV-out */
{ DRM_MODE_SUBCONNECTOR_SVIDEO,"SVIDEO"}, /* TV-out */
@@ -154,8 +148,8 @@ struct drm_conn_prop_enum_list {
 /*
  * Connector and encoder types.
  */
-static struct drm_conn_prop_enum_list drm_connector_enum_list[] =
-{  { DRM_MODE_CONNECTOR_Unknown, "Unknown" },
+static struct drm_conn_prop_enum_list drm_connector_enum_list[] = {
+   { DRM_MODE_CONNECTOR_Unknown, "Unknown" },
{ DRM_MODE_CONNECTOR_VGA, "VGA" },
{ DRM_MODE_CONNECTOR_DVII, "DVI-I" },
{ DRM_MODE_CONNECTOR_DVID, "DVI-D" },
@@ -174,8 +168,8 @@ static struct drm_conn_prop_enum_list 
drm_connector_enum_list[] =
{ DRM_MODE_CONNECTOR_DSI, "DSI" },
 };

-static