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

drm/i915/guc: rename __create/destroy_doorbell

The 2 functions don't create or destroy anything, they just update the
doorbell state in memory. Use init and fini instead for clarity.

Cc: Michal Wajdeczko <michal.wajdeczko@intel.com>
Reviewed-by: Michal Wajdeczko <michal.wajdeczko@intel.com>
Signed-off-by: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: https://patchwork.freedesktop.org/patch/msgid/20181022230427.5616-1-daniele.ceraolospurio@intel.com

authored by

Daniele Ceraolo Spurio and committed by
Chris Wilson
6f1312e6 ac128918

+6 -6
+6 -6
drivers/gpu/drm/i915/intel_guc_submission.c
··· 192 192 return client->vaddr + client->doorbell_offset; 193 193 } 194 194 195 - static void __create_doorbell(struct intel_guc_client *client) 195 + static void __init_doorbell(struct intel_guc_client *client) 196 196 { 197 197 struct guc_doorbell_info *doorbell; 198 198 ··· 201 201 doorbell->cookie = 0; 202 202 } 203 203 204 - static void __destroy_doorbell(struct intel_guc_client *client) 204 + static void __fini_doorbell(struct intel_guc_client *client) 205 205 { 206 206 struct drm_i915_private *dev_priv = guc_to_i915(client->guc); 207 207 struct guc_doorbell_info *doorbell; ··· 226 226 return -ENODEV; /* internal setup error, should never happen */ 227 227 228 228 __update_doorbell_desc(client, client->doorbell_id); 229 - __create_doorbell(client); 229 + __init_doorbell(client); 230 230 231 231 ret = __guc_allocate_doorbell(client->guc, client->stage_id); 232 232 if (ret) { 233 - __destroy_doorbell(client); 233 + __fini_doorbell(client); 234 234 __update_doorbell_desc(client, GUC_DOORBELL_INVALID); 235 235 DRM_DEBUG_DRIVER("Couldn't create client %u doorbell: %d\n", 236 236 client->stage_id, ret); ··· 246 246 247 247 GEM_BUG_ON(!has_doorbell(client)); 248 248 249 - __destroy_doorbell(client); 249 + __fini_doorbell(client); 250 250 ret = __guc_deallocate_doorbell(client->guc, client->stage_id); 251 251 if (ret) 252 252 DRM_ERROR("Couldn't destroy client %u doorbell: %d\n", ··· 1087 1087 if (intel_guc_is_alive(client->guc)) 1088 1088 destroy_doorbell(client); 1089 1089 else 1090 - __destroy_doorbell(client); 1090 + __fini_doorbell(client); 1091 1091 1092 1092 guc_stage_desc_fini(client); 1093 1093 guc_proc_desc_fini(client);