@@ -279,7 +279,7 @@ static int acp_hw_init(void *handle)
goto failure;
}
- i2s_pdata = kcalloc(1, sizeof(struct i2s_platform_data), GFP_KERNEL);
+ i2s_pdata = kzalloc(sizeof(struct i2s_platform_data), GFP_KERNEL);
if (!i2s_pdata) {
r = -ENOMEM;
goto failure;
@@ -949,7 +949,7 @@ static u32 *nwl_bridge_atomic_get_input_bus_fmts(struct drm_bridge *bridge,
return NULL;
}
- input_fmts = kcalloc(1, sizeof(*input_fmts), GFP_KERNEL);
+ input_fmts = kzalloc(sizeof(*input_fmts), GFP_KERNEL);
if (!input_fmts)
return NULL;
input_fmts[0] = input_fmt;
@@ -420,7 +420,7 @@ static int igt_evict_contexts(void *arg)
struct reserved *r;
mutex_unlock(&ggtt->vm.mutex);
- r = kcalloc(1, sizeof(*r), GFP_KERNEL);
+ r = kzalloc(sizeof(*r), GFP_KERNEL);
mutex_lock(&ggtt->vm.mutex);
if (!r) {
err = -ENOMEM;
@@ -658,7 +658,7 @@ static u32 *mtk_dpi_bridge_atomic_get_input_bus_fmts(struct drm_bridge *bridge,
*num_input_fmts = 0;
- input_fmts = kcalloc(1, sizeof(*input_fmts),
+ input_fmts = kzalloc(sizeof(*input_fmts),
GFP_KERNEL);
if (!input_fmts)
return NULL;
@@ -2786,8 +2786,7 @@ void radeon_atombios_get_power_modes(struct radeon_device *rdev)
rdev->pm.power_state = kzalloc(sizeof(struct radeon_power_state), GFP_KERNEL);
if (rdev->pm.power_state) {
rdev->pm.power_state[0].clock_info =
- kcalloc(1,
- sizeof(struct radeon_pm_clock_info),
+ kzalloc(sizeof(struct radeon_pm_clock_info),
GFP_KERNEL);
if (rdev->pm.power_state[0].clock_info) {
/* add the default mode */
@@ -2650,10 +2650,10 @@ void radeon_combios_get_power_modes(struct radeon_device *rdev)
if (rdev->pm.power_state) {
/* allocate 1 clock mode per state */
rdev->pm.power_state[0].clock_info =
- kcalloc(1, sizeof(struct radeon_pm_clock_info),
+ kzalloc(sizeof(struct radeon_pm_clock_info),
GFP_KERNEL);
rdev->pm.power_state[1].clock_info =
- kcalloc(1, sizeof(struct radeon_pm_clock_info),
+ kzalloc(sizeof(struct radeon_pm_clock_info),
GFP_KERNEL);
if (!rdev->pm.power_state[0].clock_info ||
!rdev->pm.power_state[1].clock_info)
@@ -462,7 +462,7 @@ v3d_job_init(struct v3d_dev *v3d, struct drm_file *file_priv,
bool has_multisync = se && (se->flags & DRM_V3D_EXT_ID_MULTI_SYNC);
int ret, i;
- *container = kcalloc(1, size, GFP_KERNEL);
+ *container = kzalloc(size, GFP_KERNEL);
if (!*container) {
DRM_ERROR("Cannot allocate memory for v3d job.");
return -ENOMEM;
@@ -159,7 +159,7 @@ vc4_save_hang_state(struct drm_device *dev)
unsigned long irqflags;
unsigned int i, j, k, unref_list_count;
- kernel_state = kcalloc(1, sizeof(*kernel_state), GFP_KERNEL);
+ kernel_state = kzalloc(sizeof(*kernel_state), GFP_KERNEL);
if (!kernel_state)
return;
@@ -1194,7 +1194,7 @@ vc4_submit_cl_ioctl(struct drm_device *dev, void *data,
return -EINVAL;
}
- exec = kcalloc(1, sizeof(*exec), GFP_KERNEL);
+ exec = kzalloc(sizeof(*exec), GFP_KERNEL);
if (!exec) {
DRM_ERROR("malloc failure on exec struct\n");
return -ENOMEM;
@@ -801,7 +801,7 @@ vc4_validate_shader(struct drm_gem_cma_object *shader_obj)
if (!validation_state.branch_targets)
goto fail;
- validated_shader = kcalloc(1, sizeof(*validated_shader), GFP_KERNEL);
+ validated_shader = kzalloc(sizeof(*validated_shader), GFP_KERNEL);
if (!validated_shader)
goto fail;
Use kzalloc(...) rather than kcalloc(1, ...) because the number of elements we are specifying in this case is 1, so kzalloc would accomplish the same thing and we can simplify. Signed-off-by: Kenneth Lee <klee33@uw.edu> --- drivers/gpu/drm/amd/amdgpu/amdgpu_acp.c | 2 +- drivers/gpu/drm/bridge/nwl-dsi.c | 2 +- drivers/gpu/drm/i915/selftests/i915_gem_evict.c | 2 +- drivers/gpu/drm/mediatek/mtk_dpi.c | 2 +- drivers/gpu/drm/radeon/radeon_atombios.c | 3 +-- drivers/gpu/drm/radeon/radeon_combios.c | 4 ++-- drivers/gpu/drm/v3d/v3d_gem.c | 2 +- drivers/gpu/drm/vc4/vc4_gem.c | 4 ++-- drivers/gpu/drm/vc4/vc4_validate_shaders.c | 2 +- 9 files changed, 11 insertions(+), 12 deletions(-)