[PATCH] drm/sis: fixed brace and spacing coding style issues

[Nicolas Kaiser]

Fixed brace and spacing coding style issues.

Signed-off-by: Nicolas Kaiser <nikai at nikai.net>
---
Supersedes patch "drm/sis: fixed brace coding style issues".

 drivers/gpu/drm/sis/sis_drv.c |    3 +--
 drivers/gpu/drm/sis/sis_mm.c  |   14 ++++++--------
 2 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/drivers/gpu/drm/sis/sis_drv.c b/drivers/gpu/drm/sis/sis_drv.c
index 4fd1f06..776bf9e 100644
--- a/drivers/gpu/drm/sis/sis_drv.c
+++ b/drivers/gpu/drm/sis/sis_drv.c
@@ -47,9 +47,8 @@ static int sis_driver_load(struct drm_device *dev, unsigned 
long chipset)
        dev->dev_private = (void *)dev_priv;
        dev_priv->chipset = chipset;
        ret = drm_sman_init(&dev_priv->sman, 2, 12, 8);
-       if (ret) {
+       if (ret)
                kfree(dev_priv);
-       }

        return ret;
 }
diff --git a/drivers/gpu/drm/sis/sis_mm.c b/drivers/gpu/drm/sis/sis_mm.c
index af22111..07d0f29 100644
--- a/drivers/gpu/drm/sis/sis_mm.c
+++ b/drivers/gpu/drm/sis/sis_mm.c
@@ -78,7 +78,7 @@ static unsigned long sis_sman_mm_offset(void *private, void 
*ref)
 #else /* CONFIG_FB_SIS[_MODULE] */

 #define SIS_MM_ALIGN_SHIFT 4
-#define SIS_MM_ALIGN_MASK ( (1 << SIS_MM_ALIGN_SHIFT) - 1)
+#define SIS_MM_ALIGN_MASK ((1 << SIS_MM_ALIGN_SHIFT) - 1)

 #endif /* CONFIG_FB_SIS[_MODULE] */

@@ -225,9 +225,8 @@ static drm_local_map_t *sis_reg_init(struct drm_device *dev)
                map = entry->map;
                if (!map)
                        continue;
-               if (map->type == _DRM_REGISTERS) {
+               if (map->type == _DRM_REGISTERS)
                        return map;
-               }
        }
        return NULL;
 }
@@ -264,10 +263,10 @@ int sis_idle(struct drm_device *dev)

        end = jiffies + (DRM_HZ * 3);

-       for (i=0; i<4; ++i) {
+       for (i = 0; i < 4; ++i) {
                do {
                        idle_reg = SIS_READ(0x85cc);
-               } while ( !time_after_eq(jiffies, end) &&
+               } while (!time_after_eq(jiffies, end) &&
                          ((idle_reg & 0x80000000) != 0x80000000));
        }

@@ -301,7 +300,7 @@ void sis_lastclose(struct drm_device *dev)
        mutex_unlock(&dev->struct_mutex);
 }

-void sis_reclaim_buffers_locked(struct drm_device * dev,
+void sis_reclaim_buffers_locked(struct drm_device *dev,
                                struct drm_file *file_priv)
 {
        drm_sis_private_t *dev_priv = dev->dev_private;
@@ -312,9 +311,8 @@ void sis_reclaim_buffers_locked(struct drm_device * dev,
                return;
        }

-       if (dev->driver->dma_quiescent) {
+       if (dev->driver->dma_quiescent)
                dev->driver->dma_quiescent(dev);
-       }

        drm_sman_owner_cleanup(&dev_priv->sman, (unsigned long)file_priv);
        mutex_unlock(&dev->struct_mutex);
-- 
1.7.1