aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/drm_stub.c
diff options
context:
space:
mode:
authorDavid Herrmann <dh.herrmann@gmail.com>2014-02-24 09:32:00 -0500
committerDavid Herrmann <dh.herrmann@gmail.com>2014-03-16 07:25:19 -0400
commit1abbc43761793938fba9ae745e01d5b4730a9914 (patch)
tree944e3e52ff865aa29b4a0b6d12bc143c5306d269 /drivers/gpu/drm/drm_stub.c
parent5817878c6f4221c3ace4af63260080635063371e (diff)
drm: coding-style fixes in minor handling
Properly name goto-labels, remove empty lines and use DRM_ERROR if possible. Signed-off-by: David Herrmann <dh.herrmann@gmail.com>
Diffstat (limited to 'drivers/gpu/drm/drm_stub.c')
-rw-r--r--drivers/gpu/drm/drm_stub.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/gpu/drm/drm_stub.c b/drivers/gpu/drm/drm_stub.c
index 96fe5dec3822..5268ffc5d94e 100644
--- a/drivers/gpu/drm/drm_stub.c
+++ b/drivers/gpu/drm/drm_stub.c
@@ -325,23 +325,21 @@ static int drm_minor_register(struct drm_device *dev, unsigned int type)
325 ret = drm_debugfs_init(new_minor, minor_id, drm_debugfs_root); 325 ret = drm_debugfs_init(new_minor, minor_id, drm_debugfs_root);
326 if (ret) { 326 if (ret) {
327 DRM_ERROR("DRM: Failed to initialize /sys/kernel/debug/dri.\n"); 327 DRM_ERROR("DRM: Failed to initialize /sys/kernel/debug/dri.\n");
328 goto err_mem; 328 goto err_id;
329 } 329 }
330 330
331 ret = drm_sysfs_device_add(new_minor); 331 ret = drm_sysfs_device_add(new_minor);
332 if (ret) { 332 if (ret) {
333 printk(KERN_ERR 333 DRM_ERROR("DRM: Error sysfs_device_add.\n");
334 "DRM: Error sysfs_device_add.\n");
335 goto err_debugfs; 334 goto err_debugfs;
336 } 335 }
337 336
338 DRM_DEBUG("new minor assigned %d\n", minor_id); 337 DRM_DEBUG("new minor assigned %d\n", minor_id);
339 return 0; 338 return 0;
340 339
341
342err_debugfs: 340err_debugfs:
343 drm_debugfs_cleanup(new_minor); 341 drm_debugfs_cleanup(new_minor);
344err_mem: 342err_id:
345 idr_remove(&drm_minors_idr, minor_id); 343 idr_remove(&drm_minors_idr, minor_id);
346 return ret; 344 return ret;
347} 345}