drm/sis: fixed brace and spacing coding style issues
Fixed brace and spacing coding style issues. Signed-off-by: Nicolas Kaiser <nikai@nikai.net> Signed-off-by: Dave Airlie <airlied@redhat.com>
This commit is contained in:
parent
bc5e9d6a22
commit
a7b98b6748
2 changed files with 7 additions and 10 deletions
|
@ -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;
|
||||
}
|
||||
|
|
|
@ -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);
|
||||
|
|
Loading…
Reference in a new issue