Move drm_buddy_block_state(), drm_buddy_block_is_allocated(), drm_buddy_block_is_free(), and drm_buddy_block_is_split() from drm_buddy.h to drm_buddy.c as static functions since they have no external callers.
Remove drm_get_buddy() as it was an unused exported wrapper around the internal __get_buddy(). No functional changes. Cc: Christian König <[email protected]> Cc: Arunpravin Paneer Selvam <[email protected]> Suggested-by: Matthew Auld <[email protected]> Signed-off-by: Sanjay Yadav <[email protected]> --- drivers/gpu/drm/drm_buddy.c | 41 ++++++++++++++++++++++--------------- include/drm/drm_buddy.h | 27 ------------------------ 2 files changed, 24 insertions(+), 44 deletions(-) diff --git a/drivers/gpu/drm/drm_buddy.c b/drivers/gpu/drm/drm_buddy.c index fd34d3755f7c..05fe9d12e274 100644 --- a/drivers/gpu/drm/drm_buddy.c +++ b/drivers/gpu/drm/drm_buddy.c @@ -21,6 +21,30 @@ enum drm_buddy_free_tree { static struct kmem_cache *slab_blocks; +static unsigned int +drm_buddy_block_state(struct drm_buddy_block *block) +{ + return block->header & DRM_BUDDY_HEADER_STATE; +} + +static bool +drm_buddy_block_is_allocated(struct drm_buddy_block *block) +{ + return drm_buddy_block_state(block) == DRM_BUDDY_ALLOCATED; +} + +static bool +drm_buddy_block_is_free(struct drm_buddy_block *block) +{ + return drm_buddy_block_state(block) == DRM_BUDDY_FREE; +} + +static bool +drm_buddy_block_is_split(struct drm_buddy_block *block) +{ + return drm_buddy_block_state(block) == DRM_BUDDY_SPLIT; +} + #define for_each_free_tree(tree) \ for ((tree) = 0; (tree) < DRM_BUDDY_MAX_FREE_TREES; (tree)++) @@ -459,23 +483,6 @@ static int split_block(struct drm_buddy *mm, return 0; } -/** - * drm_get_buddy - get buddy address - * - * @block: DRM buddy block - * - * Returns the corresponding buddy block for @block, or NULL - * if this is a root block and can't be merged further. - * Requires some kind of locking to protect against - * any concurrent allocate and free operations. - */ -struct drm_buddy_block * -drm_get_buddy(struct drm_buddy_block *block) -{ - return __get_buddy(block); -} -EXPORT_SYMBOL(drm_get_buddy); - /** * drm_buddy_reset_clear - reset blocks clear state * diff --git a/include/drm/drm_buddy.h b/include/drm/drm_buddy.h index b909fa8f810a..eb8b4f5e15b3 100644 --- a/include/drm/drm_buddy.h +++ b/include/drm/drm_buddy.h @@ -101,36 +101,12 @@ drm_buddy_block_order(struct drm_buddy_block *block) return block->header & DRM_BUDDY_HEADER_ORDER; } -static inline unsigned int -drm_buddy_block_state(struct drm_buddy_block *block) -{ - return block->header & DRM_BUDDY_HEADER_STATE; -} - -static inline bool -drm_buddy_block_is_allocated(struct drm_buddy_block *block) -{ - return drm_buddy_block_state(block) == DRM_BUDDY_ALLOCATED; -} - static inline bool drm_buddy_block_is_clear(struct drm_buddy_block *block) { return block->header & DRM_BUDDY_HEADER_CLEAR; } -static inline bool -drm_buddy_block_is_free(struct drm_buddy_block *block) -{ - return drm_buddy_block_state(block) == DRM_BUDDY_FREE; -} - -static inline bool -drm_buddy_block_is_split(struct drm_buddy_block *block) -{ - return drm_buddy_block_state(block) == DRM_BUDDY_SPLIT; -} - static inline u64 drm_buddy_block_size(struct drm_buddy *mm, struct drm_buddy_block *block) @@ -142,9 +118,6 @@ int drm_buddy_init(struct drm_buddy *mm, u64 size, u64 chunk_size); void drm_buddy_fini(struct drm_buddy *mm); -struct drm_buddy_block * -drm_get_buddy(struct drm_buddy_block *block); - int drm_buddy_alloc_blocks(struct drm_buddy *mm, u64 start, u64 end, u64 size, u64 min_page_size, -- 2.52.0
