evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

drm/sis: fixed brace and spacing coding style issues

Browse source 
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:
Nicolas Kaiser 2010-07-09 16:47:28 +02:00 • committed by Dave Airlie
parent bc5e9d6a22
commit a7b98b6748
2 changed files with 7 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
drivers/gpu/drm/sis/sis_drv.c
View file

@ -47,9 +47,8 @@ static int sis_driver_load(struct drm_device *dev, unsigned long chipset)
dev->dev_private = (void *)dev_priv; dev->dev_private = (void *)dev_priv;
dev_priv->chipset = chipset; dev_priv->chipset = chipset;
ret = drm_sman_init(&dev_priv->sman, 2, 12, 8); ret = drm_sman_init(&dev_priv->sman, 2, 12, 8);
if (ret) { if (ret)
kfree(dev_priv); kfree(dev_priv);
}
return ret; return ret;
} }

14
drivers/gpu/drm/sis/sis_mm.c
View file

@ -78,7 +78,7 @@ static unsigned long sis_sman_mm_offset(void *private, void *ref)
#else /* CONFIG_FB_SIS[_MODULE] */ #else /* CONFIG_FB_SIS[_MODULE] */
#define SIS_MM_ALIGN_SHIFT 4 #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] */ #endif /* CONFIG_FB_SIS[_MODULE] */
@ -225,9 +225,8 @@ static drm_local_map_t *sis_reg_init(struct drm_device *dev)
map = entry->map; map = entry->map;
if (!map) if (!map)
continue; continue;
if (map->type == _DRM_REGISTERS) { if (map->type == _DRM_REGISTERS)
return map; return map;
}
} }
return NULL; return NULL;
} }
@ -264,10 +263,10 @@ int sis_idle(struct drm_device *dev)
end = jiffies + (DRM_HZ * 3); end = jiffies + (DRM_HZ * 3);
for (i=0; i<4; ++i) { for (i = 0; i < 4; ++i) {
do { do {
idle_reg = SIS_READ(0x85cc); idle_reg = SIS_READ(0x85cc);
} while ( !time_after_eq(jiffies, end) && } while (!time_after_eq(jiffies, end) &&
((idle_reg & 0x80000000) != 0x80000000)); ((idle_reg & 0x80000000) != 0x80000000));
} }
@ -301,7 +300,7 @@ void sis_lastclose(struct drm_device *dev)
mutex_unlock(&dev->struct_mutex); 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) struct drm_file *file_priv)
{ {
drm_sis_private_t *dev_priv = dev->dev_private; drm_sis_private_t *dev_priv = dev->dev_private;
@ -312,9 +311,8 @@ void sis_reclaim_buffers_locked(struct drm_device * dev,
return; return;
} }
if (dev->driver->dma_quiescent) { if (dev->driver->dma_quiescent)
dev->driver->dma_quiescent(dev); dev->driver->dma_quiescent(dev);
}
drm_sman_owner_cleanup(&dev_priv->sman, (unsigned long)file_priv); drm_sman_owner_cleanup(&dev_priv->sman, (unsigned long)file_priv);
mutex_unlock(&dev->struct_mutex); mutex_unlock(&dev->struct_mutex);