From: Tvrtko Ursulin Date: Fri, 12 Jan 2018 17:03:40 +0000 (+0000) Subject: drm/i915/pmu: Use kcalloc instead of kzalloc X-Git-Tag: android-x86-8.1-r1~365^2~46^2~823 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=dd5fec87efdd54db6870b5d24c1fd3cda94f4510;p=android-x86%2Fkernel.git drm/i915/pmu: Use kcalloc instead of kzalloc kcalloc is preffered for allocating arrays. Signed-off-by: Tvrtko Ursulin Suggested-by: Ville Syrjälä Cc: Ville Syrjälä Reviewed-by: Ville Syrjälä Link: https://patchwork.freedesktop.org/patch/msgid/20180112170340.5387-2-tvrtko.ursulin@linux.intel.com --- diff --git a/drivers/gpu/drm/i915/i915_pmu.c b/drivers/gpu/drm/i915/i915_pmu.c index 9be4f5201e41..065a28c713c4 100644 --- a/drivers/gpu/drm/i915/i915_pmu.c +++ b/drivers/gpu/drm/i915/i915_pmu.c @@ -785,16 +785,16 @@ create_event_attributes(struct drm_i915_private *i915) } /* Allocate attribute objects and table. */ - i915_attr = kzalloc(count * sizeof(*i915_attr), GFP_KERNEL); + i915_attr = kcalloc(count, sizeof(*i915_attr), GFP_KERNEL); if (!i915_attr) goto err_alloc; - pmu_attr = kzalloc(count * sizeof(*pmu_attr), GFP_KERNEL); + pmu_attr = kcalloc(count, sizeof(*pmu_attr), GFP_KERNEL); if (!pmu_attr) goto err_alloc; /* Max one pointer of each attribute type plus a termination entry. */ - attr = kzalloc((count * 2 + 1) * sizeof(*attr), GFP_KERNEL); + attr = kcalloc(count * 2 + 1, sizeof(*attr), GFP_KERNEL); if (!attr) goto err_alloc;