Re: [PATCH v2] drm: Replace kzalloc with kcalloc
From: Sean Paul
Date: Fri Oct 13 2017 - 16:07:04 EST
On Fri, Oct 13, 2017 at 10:58:33AM +0300, Jani Nikula wrote:
> On Fri, 13 Oct 2017, Harsha Sharma <harshasharmaiitr@xxxxxxxxx> wrote:
> > Prefer kcalloc over kzalloc to allocate an array.
> > This patch fixes checkcpatch issue.
> >
> > Signed-off-by: Harsha Sharma <harshasharmaiitr@xxxxxxxxx>
>
> Reviewed-by: Jani Nikula <jani.nikula@xxxxxxxxx>
>
Applied to -misc-next, thanks!
Sean
>
> > ---
> > Changes in v2:
> > -kcalloc will take 3 arguments
> >
> > drivers/gpu/drm/drm_crtc_helper.c | 4 ++--
> > drivers/gpu/drm/drm_fb_helper.c | 2 +-
> > drivers/gpu/drm/drm_plane_helper.c | 2 +-
> > 3 files changed, 4 insertions(+), 4 deletions(-)
> >
> > diff --git a/drivers/gpu/drm/drm_crtc_helper.c b/drivers/gpu/drm/drm_crtc_helper.c
> > index eab36a460638..5a84c3bc915d 100644
> > --- a/drivers/gpu/drm/drm_crtc_helper.c
> > +++ b/drivers/gpu/drm/drm_crtc_helper.c
> > @@ -562,12 +562,12 @@ int drm_crtc_helper_set_config(struct drm_mode_set *set,
> > * Allocate space for the backup of all (non-pointer) encoder and
> > * connector data.
> > */
> > - save_encoder_crtcs = kzalloc(dev->mode_config.num_encoder *
> > + save_encoder_crtcs = kcalloc(dev->mode_config.num_encoder,
> > sizeof(struct drm_crtc *), GFP_KERNEL);
> > if (!save_encoder_crtcs)
> > return -ENOMEM;
> >
> > - save_connector_encoders = kzalloc(dev->mode_config.num_connector *
> > + save_connector_encoders = kcalloc(dev->mode_config.num_connector,
> > sizeof(struct drm_encoder *), GFP_KERNEL);
> > if (!save_connector_encoders) {
> > kfree(save_encoder_crtcs);
> > diff --git a/drivers/gpu/drm/drm_fb_helper.c b/drivers/gpu/drm/drm_fb_helper.c
> > index 1b8f013ffa65..de31e52ab9cb 100644
> > --- a/drivers/gpu/drm/drm_fb_helper.c
> > +++ b/drivers/gpu/drm/drm_fb_helper.c
> > @@ -2266,7 +2266,7 @@ static int drm_pick_crtcs(struct drm_fb_helper *fb_helper,
> > if (modes[n] == NULL)
> > return best_score;
> >
> > - crtcs = kzalloc(fb_helper->connector_count *
> > + crtcs = kcalloc(fb_helper->connector_count,
> > sizeof(struct drm_fb_helper_crtc *), GFP_KERNEL);
> > if (!crtcs)
> > return best_score;
> > diff --git a/drivers/gpu/drm/drm_plane_helper.c b/drivers/gpu/drm/drm_plane_helper.c
> > index 06aee1741e96..759ed93f4ba8 100644
> > --- a/drivers/gpu/drm/drm_plane_helper.c
> > +++ b/drivers/gpu/drm/drm_plane_helper.c
> > @@ -354,7 +354,7 @@ int drm_primary_helper_update(struct drm_plane *plane, struct drm_crtc *crtc,
> > /* Find current connectors for CRTC */
> > num_connectors = get_connectors_for_crtc(crtc, NULL, 0);
> > BUG_ON(num_connectors == 0);
> > - connector_list = kzalloc(num_connectors * sizeof(*connector_list),
> > + connector_list = kcalloc(num_connectors, sizeof(*connector_list),
> > GFP_KERNEL);
> > if (!connector_list)
> > return -ENOMEM;
>
> --
> Jani Nikula, Intel Open Source Technology Center
--
Sean Paul, Software Engineer, Google / Chromium OS