[PATCH libdrm 02/11] libdrm: Remove gratuitous blank lines

2015-01-25 Thread Laurent Pinchart
Hi Thierry,

Thank you for the patch.

On Friday 23 January 2015 17:08:15 Thierry Reding wrote:
> From: Thierry Reding 
> 
> Usage of blank lines can be a matter of taste, of course, but for these
> we can surely all agree that they're not needed and inconsistent.
> 
> Signed-off-by: Thierry Reding 

Acked-by: Laurent Pinchart 

> ---
>  xf86drmMode.c | 11 ---
>  1 file changed, 11 deletions(-)
> 
> diff --git a/xf86drmMode.c b/xf86drmMode.c
> index f6e4416b88b5..7e228b3e7aa3 100644
> --- a/xf86drmMode.c
> +++ b/xf86drmMode.c
> @@ -115,7 +115,6 @@ void drmModeFreeResources(drmModeResPtr ptr)
>   drmFree(ptr->connectors);
>   drmFree(ptr->encoders);
>   drmFree(ptr);
> -
>  }
> 
>  void drmModeFreeFB(drmModeFBPtr ptr)
> @@ -133,7 +132,6 @@ void drmModeFreeCrtc(drmModeCrtcPtr ptr)
>   return;
> 
>   drmFree(ptr);
> -
>  }
> 
>  void drmModeFreeConnector(drmModeConnectorPtr ptr)
> @@ -146,7 +144,6 @@ void drmModeFreeConnector(drmModeConnectorPtr ptr)
>   drmFree(ptr->props);
>   drmFree(ptr->modes);
>   drmFree(ptr);
> -
>  }
> 
>  void drmModeFreeEncoder(drmModeEncoderPtr ptr)
> @@ -301,8 +298,6 @@ int drmModeAddFB2(int fd, uint32_t width, uint32_t
> height, int drmModeRmFB(int fd, uint32_t bufferId)
>  {
>   return DRM_IOCTL(fd, DRM_IOCTL_MODE_RMFB, );
> -
> -
>  }
> 
>  drmModeFBPtr drmModeGetFB(int fd, uint32_t buf)
> @@ -342,7 +337,6 @@ int drmModeDirtyFB(int fd, uint32_t bufferId,
>   return DRM_IOCTL(fd, DRM_IOCTL_MODE_DIRTYFB, );
>  }
> 
> -
>  /*
>   * Crtc functions
>   */
> @@ -379,7 +373,6 @@ drmModeCrtcPtr drmModeGetCrtc(int fd, uint32_t crtcId)
>   return r;
>  }
> 
> -
>  int drmModeSetCrtc(int fd, uint32_t crtcId, uint32_t bufferId,
> uint32_t x, uint32_t y, uint32_t *connectors, int count,
> drmModeModeInfoPtr mode)
> @@ -594,7 +587,6 @@ int drmModeDetachMode(int fd, uint32_t connector_id,
> drmModeModeInfoPtr mode_inf return DRM_IOCTL(fd, DRM_IOCTL_MODE_DETACHMODE,
> );
>  }
> 
> -
>  drmModePropertyPtr drmModeGetProperty(int fd, uint32_t property_id)
>  {
>   struct drm_mode_get_property prop;
> @@ -812,7 +804,6 @@ int drmCheckModesettingSupported(const char *busid)
>   return 0;
>  #endif
>   return -ENOSYS;
> -
>  }
> 
>  int drmModeCrtcGetGamma(int fd, uint32_t crtc_id, uint32_t size,
> @@ -914,7 +905,6 @@ int drmModeSetPlane(int fd, uint32_t plane_id, uint32_t
> crtc_id, uint32_t crtc_w, uint32_t crtc_h,
>   uint32_t src_x, uint32_t src_y,
>   uint32_t src_w, uint32_t src_h)
> -
>  {
>   struct drm_mode_set_plane s;
> 
> @@ -934,7 +924,6 @@ int drmModeSetPlane(int fd, uint32_t plane_id, uint32_t
> crtc_id, return DRM_IOCTL(fd, DRM_IOCTL_MODE_SETPLANE, );
>  }
> 
> -
>  drmModePlanePtr drmModeGetPlane(int fd, uint32_t plane_id)
>  {
>   struct drm_mode_get_plane ovr, counts;

-- 
Regards,

Laurent Pinchart



[PATCH libdrm 02/11] libdrm: Remove gratuitous blank lines

2015-01-23 Thread Thierry Reding
From: Thierry Reding 

Usage of blank lines can be a matter of taste, of course, but for these
we can surely all agree that they're not needed and inconsistent.

Signed-off-by: Thierry Reding 
---
 xf86drmMode.c | 11 ---
 1 file changed, 11 deletions(-)

diff --git a/xf86drmMode.c b/xf86drmMode.c
index f6e4416b88b5..7e228b3e7aa3 100644
--- a/xf86drmMode.c
+++ b/xf86drmMode.c
@@ -115,7 +115,6 @@ void drmModeFreeResources(drmModeResPtr ptr)
drmFree(ptr->connectors);
drmFree(ptr->encoders);
drmFree(ptr);
-
 }

 void drmModeFreeFB(drmModeFBPtr ptr)
@@ -133,7 +132,6 @@ void drmModeFreeCrtc(drmModeCrtcPtr ptr)
return;

drmFree(ptr);
-
 }

 void drmModeFreeConnector(drmModeConnectorPtr ptr)
@@ -146,7 +144,6 @@ void drmModeFreeConnector(drmModeConnectorPtr ptr)
drmFree(ptr->props);
drmFree(ptr->modes);
drmFree(ptr);
-
 }

 void drmModeFreeEncoder(drmModeEncoderPtr ptr)
@@ -301,8 +298,6 @@ int drmModeAddFB2(int fd, uint32_t width, uint32_t height,
 int drmModeRmFB(int fd, uint32_t bufferId)
 {
return DRM_IOCTL(fd, DRM_IOCTL_MODE_RMFB, );
-
-
 }

 drmModeFBPtr drmModeGetFB(int fd, uint32_t buf)
@@ -342,7 +337,6 @@ int drmModeDirtyFB(int fd, uint32_t bufferId,
return DRM_IOCTL(fd, DRM_IOCTL_MODE_DIRTYFB, );
 }

-
 /*
  * Crtc functions
  */
@@ -379,7 +373,6 @@ drmModeCrtcPtr drmModeGetCrtc(int fd, uint32_t crtcId)
return r;
 }

-
 int drmModeSetCrtc(int fd, uint32_t crtcId, uint32_t bufferId,
uint32_t x, uint32_t y, uint32_t *connectors, int count,
   drmModeModeInfoPtr mode)
@@ -594,7 +587,6 @@ int drmModeDetachMode(int fd, uint32_t connector_id, 
drmModeModeInfoPtr mode_inf
return DRM_IOCTL(fd, DRM_IOCTL_MODE_DETACHMODE, );
 }

-
 drmModePropertyPtr drmModeGetProperty(int fd, uint32_t property_id)
 {
struct drm_mode_get_property prop;
@@ -812,7 +804,6 @@ int drmCheckModesettingSupported(const char *busid)
return 0;
 #endif
return -ENOSYS;
-
 }

 int drmModeCrtcGetGamma(int fd, uint32_t crtc_id, uint32_t size,
@@ -914,7 +905,6 @@ int drmModeSetPlane(int fd, uint32_t plane_id, uint32_t 
crtc_id,
uint32_t crtc_w, uint32_t crtc_h,
uint32_t src_x, uint32_t src_y,
uint32_t src_w, uint32_t src_h)
-
 {
struct drm_mode_set_plane s;

@@ -934,7 +924,6 @@ int drmModeSetPlane(int fd, uint32_t plane_id, uint32_t 
crtc_id,
return DRM_IOCTL(fd, DRM_IOCTL_MODE_SETPLANE, );
 }

-
 drmModePlanePtr drmModeGetPlane(int fd, uint32_t plane_id)
 {
struct drm_mode_get_plane ovr, counts;
-- 
2.1.3