Skip to content

Commit 44eea8d

Browse files
committed
drm/i915: Remove return type from i915_drm_client_remove_object
There is no need to return anything in the version which was merged and also the implementation of the !CONFIG_PROC_FS wasn't returning anything, causing a build failure there. Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com> Fixes: e4ae85e ("drm/i915: Add ability for tracking buffer objects per client") Cc: Aravind Iddamsetty <aravind.iddamsetty@intel.com> Reported-by: kernel test robot <lkp@intel.com> Closes: https://lore.kernel.org/oe-kbuild-all/202311110104.8TlHVxUI-lkp@intel.com/ Reviewed-by: Jani Nikula <jani.nikula@intel.com> Reviewed-by: Andi Shyti <andi.shyti@linux.intel.com> Link: https://patchwork.freedesktop.org/patch/msgid/20231113085457.199053-1-tvrtko.ursulin@linux.intel.com
1 parent 3c7a5eb commit 44eea8d

2 files changed

Lines changed: 5 additions & 6 deletions

File tree

drivers/gpu/drm/i915/i915_drm_client.c

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -191,22 +191,20 @@ void i915_drm_client_add_object(struct i915_drm_client *client,
191191
spin_unlock_irqrestore(&client->objects_lock, flags);
192192
}
193193

194-
bool i915_drm_client_remove_object(struct drm_i915_gem_object *obj)
194+
void i915_drm_client_remove_object(struct drm_i915_gem_object *obj)
195195
{
196196
struct i915_drm_client *client = fetch_and_zero(&obj->client);
197197
unsigned long flags;
198198

199199
/* Object may not be associated with a client. */
200200
if (!client)
201-
return false;
201+
return;
202202

203203
spin_lock_irqsave(&client->objects_lock, flags);
204204
list_del_rcu(&obj->client_link);
205205
spin_unlock_irqrestore(&client->objects_lock, flags);
206206

207207
i915_drm_client_put(client);
208-
209-
return true;
210208
}
211209

212210
void i915_drm_client_add_context_objects(struct i915_drm_client *client,

drivers/gpu/drm/i915/i915_drm_client.h

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ void i915_drm_client_fdinfo(struct drm_printer *p, struct drm_file *file);
7070
#ifdef CONFIG_PROC_FS
7171
void i915_drm_client_add_object(struct i915_drm_client *client,
7272
struct drm_i915_gem_object *obj);
73-
bool i915_drm_client_remove_object(struct drm_i915_gem_object *obj);
73+
void i915_drm_client_remove_object(struct drm_i915_gem_object *obj);
7474
void i915_drm_client_add_context_objects(struct i915_drm_client *client,
7575
struct intel_context *ce);
7676
#else
@@ -79,7 +79,8 @@ static inline void i915_drm_client_add_object(struct i915_drm_client *client,
7979
{
8080
}
8181

82-
static inline bool i915_drm_client_remove_object(struct drm_i915_gem_object *obj)
82+
static inline void
83+
i915_drm_client_remove_object(struct drm_i915_gem_object *obj)
8384
{
8485
}
8586

0 commit comments

Comments
 (0)