Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

drm: make drm_mm_init() return void

There is no reason to return "int" as this function never fails.
Furthermore, several drivers (ast, sis) already depend on this.

Signed-off-by: David Herrmann <dh.herrmann@gmail.com>
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Dave Airlie <airlied@redhat.com>

authored by

David Herrmann and committed by
Dave Airlie
77ef8bbc 6ef92fbe

+8 -24
+2 -6
drivers/gpu/drm/drm_gem.c
··· 108 108 return -ENOMEM; 109 109 } 110 110 111 - if (drm_mm_init(&mm->offset_manager, DRM_FILE_PAGE_OFFSET_START, 112 - DRM_FILE_PAGE_OFFSET_SIZE)) { 113 - drm_ht_remove(&mm->offset_hash); 114 - kfree(mm); 115 - return -ENOMEM; 116 - } 111 + drm_mm_init(&mm->offset_manager, DRM_FILE_PAGE_OFFSET_START, 112 + DRM_FILE_PAGE_OFFSET_SIZE); 117 113 118 114 return 0; 119 115 }
+1 -3
drivers/gpu/drm/drm_mm.c
··· 669 669 } 670 670 EXPORT_SYMBOL(drm_mm_clean); 671 671 672 - int drm_mm_init(struct drm_mm * mm, unsigned long start, unsigned long size) 672 + void drm_mm_init(struct drm_mm * mm, unsigned long start, unsigned long size) 673 673 { 674 674 INIT_LIST_HEAD(&mm->hole_stack); 675 675 INIT_LIST_HEAD(&mm->unused_nodes); ··· 690 690 list_add_tail(&mm->head_node.hole_stack, &mm->hole_stack); 691 691 692 692 mm->color_adjust = NULL; 693 - 694 - return 0; 695 693 } 696 694 EXPORT_SYMBOL(drm_mm_init); 697 695
+1 -5
drivers/gpu/drm/ttm/ttm_bo.c
··· 1455 1455 goto out_no_sys; 1456 1456 1457 1457 bdev->addr_space_rb = RB_ROOT; 1458 - ret = drm_mm_init(&bdev->addr_space_mm, file_page_offset, 0x10000000); 1459 - if (unlikely(ret != 0)) 1460 - goto out_no_addr_mm; 1458 + drm_mm_init(&bdev->addr_space_mm, file_page_offset, 0x10000000); 1461 1459 1462 1460 INIT_DELAYED_WORK(&bdev->wq, ttm_bo_delayed_workqueue); 1463 1461 INIT_LIST_HEAD(&bdev->ddestroy); ··· 1469 1471 mutex_unlock(&glob->device_list_mutex); 1470 1472 1471 1473 return 0; 1472 - out_no_addr_mm: 1473 - ttm_bo_clean_mm(bdev, 0); 1474 1474 out_no_sys: 1475 1475 return ret; 1476 1476 }
+1 -7
drivers/gpu/drm/ttm/ttm_bo_manager.c
··· 103 103 unsigned long p_size) 104 104 { 105 105 struct ttm_range_manager *rman; 106 - int ret; 107 106 108 107 rman = kzalloc(sizeof(*rman), GFP_KERNEL); 109 108 if (!rman) 110 109 return -ENOMEM; 111 110 112 - ret = drm_mm_init(&rman->mm, 0, p_size); 113 - if (ret) { 114 - kfree(rman); 115 - return ret; 116 - } 117 - 111 + drm_mm_init(&rman->mm, 0, p_size); 118 112 spin_lock_init(&rman->lock); 119 113 man->priv = rman; 120 114 return 0;
+3 -3
include/drm/drm_mm.h
··· 275 275 return drm_mm_search_free_in_range_generic(mm, size, alignment, color, 276 276 start, end, best_match); 277 277 } 278 - extern int drm_mm_init(struct drm_mm *mm, 279 - unsigned long start, 280 - unsigned long size); 278 + extern void drm_mm_init(struct drm_mm *mm, 279 + unsigned long start, 280 + unsigned long size); 281 281 extern void drm_mm_takedown(struct drm_mm *mm); 282 282 extern int drm_mm_clean(struct drm_mm *mm); 283 283 extern int drm_mm_pre_get(struct drm_mm *mm);