Re: [PATCH 1/5] drm/i915: use pointer = k[cmz...]alloc(sizeof(*pointer), ...) pattern

Jani Nikula
2013-09-19T10:32:06Z

On Thu, 19 Sep 2013, Daniel Vetter <daniel.vetter@ffwll.ch> wrote:
> Done while reviewing all our allocations for fubar. Also a few errant
> cases of lacking () for the sizeof operator - just a bit of OCD.
>
> I've left out all the conversions that also should use kcalloc from
> this patch (it's only 2).

Reviewed-by: Jani Nikula <jani.nikula@intel.com>

> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
> ---
> drivers/gpu/drm/i915/i915_debugfs.c | 2 +-
> drivers/gpu/drm/i915/i915_dma.c | 6 +++---
> drivers/gpu/drm/i915/i915_gem.c | 2 +-
> drivers/gpu/drm/i915/intel_crt.c | 2 +-
> drivers/gpu/drm/i915/intel_ddi.c | 6 +++---
> drivers/gpu/drm/i915/intel_display.c | 2 +-
> drivers/gpu/drm/i915/intel_dp.c | 4 ++--
> drivers/gpu/drm/i915/intel_dvo.c | 4 ++--
> drivers/gpu/drm/i915/intel_fb.c | 2 +-
> drivers/gpu/drm/i915/intel_hdmi.c | 4 ++--
> drivers/gpu/drm/i915/intel_lvds.c | 4 ++--
> drivers/gpu/drm/i915/intel_overlay.c | 4 ++--
> drivers/gpu/drm/i915/intel_pm.c | 2 +-
> drivers/gpu/drm/i915/intel_sdvo.c | 10 +++++-----
> drivers/gpu/drm/i915/intel_sprite.c | 2 +-
> drivers/gpu/drm/i915/intel_tv.c | 4 ++--
> 16 files changed, 30 insertions(+), 30 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c
> index 1d77624..821406c 100644
> --- a/drivers/gpu/drm/i915/i915_debugfs.c
> +++ b/drivers/gpu/drm/i915/i915_debugfs.c
> @@ -2145,7 +2145,7 @@ drm_add_fake_info_node(struct drm_minor *minor,
> {
> struct drm_info_node *node;
>
> - node = kmalloc(sizeof(struct drm_info_node), GFP_KERNEL);
> + node = kmalloc(sizeof(*node), GFP_KERNEL);
> if (node == NULL) {
> debugfs_remove(ent);
> return -ENOMEM;
> diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c
> index f4f9895..f7b3d0f 100644
> --- a/drivers/gpu/drm/i915/i915_dma.c
> +++ b/drivers/gpu/drm/i915/i915_dma.c
> @@ -641,7 +641,7 @@ static int i915_batchbuffer(struct drm_device *dev, void *data,
>
> if (batch->num_cliprects) {
> cliprects = kcalloc(batch->num_cliprects,
> - sizeof(struct drm_clip_rect),
> + sizeof(*cliprects),
> GFP_KERNEL);
> if (cliprects == NULL)
> return -ENOMEM;
> @@ -703,7 +703,7 @@ static int i915_cmdbuffer(struct drm_device *dev, void *data,
>
> if (cmdbuf->num_cliprects) {
> cliprects = kcalloc(cmdbuf->num_cliprects,
> - sizeof(struct drm_clip_rect), GFP_KERNEL);
> + sizeof(*cliprects), GFP_KERNEL);
> if (cliprects == NULL) {
> ret = -ENOMEM;
> goto fail_batch_free;
> @@ -1472,7 +1472,7 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags)
> dev->types[8] = _DRM_STAT_SECONDARY;
> dev->types[9] = _DRM_STAT_DMA;
>
> - dev_priv = kzalloc(sizeof(drm_i915_private_t), GFP_KERNEL);
> + dev_priv = kzalloc(sizeof(*dev_priv), GFP_KERNEL);
> if (dev_priv == NULL)
> return -ENOMEM;
>
> diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
> index d00d24f..c6d0353 100644
> --- a/drivers/gpu/drm/i915/i915_gem.c
> +++ b/drivers/gpu/drm/i915/i915_gem.c
> @@ -4599,7 +4599,7 @@ static int i915_gem_init_phys_object(struct drm_device *dev,
> if (dev_priv->mm.phys_objs[id - 1] || !size)
> return 0;
>
> - phys_obj = kzalloc(sizeof(struct drm_i915_gem_phys_object), GFP_KERNEL);
> + phys_obj = kzalloc(sizeof(*phys_obj), GFP_KERNEL);
> if (!phys_obj)
> return -ENOMEM;
>
> diff --git a/drivers/gpu/drm/i915/intel_crt.c b/drivers/gpu/drm/i915/intel_crt.c
> index 6f101d5..f9a5f3d 100644
> --- a/drivers/gpu/drm/i915/intel_crt.c
> +++ b/drivers/gpu/drm/i915/intel_crt.c
> @@ -764,7 +764,7 @@ void intel_crt_init(struct drm_device *dev)
> if (!crt)
> return;
>
> - intel_connector = kzalloc(sizeof(struct intel_connector), GFP_KERNEL);
> + intel_connector = kzalloc(sizeof(*intel_connector), GFP_KERNEL);
> if (!intel_connector) {
> kfree(crt);
> return;
> diff --git a/drivers/gpu/drm/i915/intel_ddi.c b/drivers/gpu/drm/i915/intel_ddi.c
> index 4918995..46bc43c 100644
> --- a/drivers/gpu/drm/i915/intel_ddi.c
> +++ b/drivers/gpu/drm/i915/intel_ddi.c
> @@ -1337,11 +1337,11 @@ void intel_ddi_init(struct drm_device *dev, enum port port)
> struct intel_connector *hdmi_connector = NULL;
> struct intel_connector *dp_connector = NULL;
>
> - intel_dig_port = kzalloc(sizeof(struct intel_digital_port), GFP_KERNEL);
> + intel_dig_port = kzalloc(sizeof(*intel_dig_port), GFP_KERNEL);
> if (!intel_dig_port)
> return;
>
> - dp_connector = kzalloc(sizeof(struct intel_connector), GFP_KERNEL);
> + dp_connector = kzalloc(sizeof(*dp_connector), GFP_KERNEL);
> if (!dp_connector) {
> kfree(intel_dig_port);
> return;
> @@ -1381,7 +1381,7 @@ void intel_ddi_init(struct drm_device *dev, enum port port)
> }
>
> if (intel_encoder->type != INTEL_OUTPUT_EDP) {
> - hdmi_connector = kzalloc(sizeof(struct intel_connector),
> + hdmi_connector = kzalloc(sizeof(*hdmi_connector),
> GFP_KERNEL);
> if (!hdmi_connector) {
> return;
> diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
> index 4dd6561..fe8db37 100644
> --- a/drivers/gpu/drm/i915/intel_display.c
> +++ b/drivers/gpu/drm/i915/intel_display.c
> @@ -8092,7 +8092,7 @@ static int intel_crtc_page_flip(struct drm_crtc *crtc,
> fb->pitches[0] != crtc->fb->pitches[0]))
> return -EINVAL;
>
> - work = kzalloc(sizeof *work, GFP_KERNEL);
> + work = kzalloc(sizeof(*work), GFP_KERNEL);
> if (work == NULL)
> return -ENOMEM;
>
> diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
> index 9770160..d840bc8 100644
> --- a/drivers/gpu/drm/i915/intel_dp.c
> +++ b/drivers/gpu/drm/i915/intel_dp.c
> @@ -3614,11 +3614,11 @@ intel_dp_init(struct drm_device *dev, int output_reg, enum port port)
> struct drm_encoder *encoder;
> struct intel_connector *intel_connector;
>
> - intel_dig_port = kzalloc(sizeof(struct intel_digital_port), GFP_KERNEL);
> + intel_dig_port = kzalloc(sizeof(*intel_dig_port), GFP_KERNEL);
> if (!intel_dig_port)
> return;
>
> - intel_connector = kzalloc(sizeof(struct intel_connector), GFP_KERNEL);
> + intel_connector = kzalloc(sizeof(*intel_connector), GFP_KERNEL);
> if (!intel_connector) {
> kfree(intel_dig_port);
> return;
> diff --git a/drivers/gpu/drm/i915/intel_dvo.c b/drivers/gpu/drm/i915/intel_dvo.c
> index fe65c72..3ff9e2c 100644
> --- a/drivers/gpu/drm/i915/intel_dvo.c
> +++ b/drivers/gpu/drm/i915/intel_dvo.c
> @@ -446,11 +446,11 @@ void intel_dvo_init(struct drm_device *dev)
> int i;
> int encoder_type = DRM_MODE_ENCODER_NONE;
>
> - intel_dvo = kzalloc(sizeof(struct intel_dvo), GFP_KERNEL);
> + intel_dvo = kzalloc(sizeof(*intel_dvo), GFP_KERNEL);
> if (!intel_dvo)
> return;
>
> - intel_connector = kzalloc(sizeof(struct intel_connector), GFP_KERNEL);
> + intel_connector = kzalloc(sizeof(*intel_connector), GFP_KERNEL);
> if (!intel_connector) {
> kfree(intel_dvo);
> return;
> diff --git a/drivers/gpu/drm/i915/intel_fb.c b/drivers/gpu/drm/i915/intel_fb.c
> index bc21000..6aa66aa 100644
> --- a/drivers/gpu/drm/i915/intel_fb.c
> +++ b/drivers/gpu/drm/i915/intel_fb.c
> @@ -216,7 +216,7 @@ int intel_fbdev_init(struct drm_device *dev)
> struct drm_i915_private *dev_priv = dev->dev_private;
> int ret;
>
> - ifbdev = kzalloc(sizeof(struct intel_fbdev), GFP_KERNEL);
> + ifbdev = kzalloc(sizeof(*ifbdev), GFP_KERNEL);
> if (!ifbdev)
> return -ENOMEM;
>
> diff --git a/drivers/gpu/drm/i915/intel_hdmi.c b/drivers/gpu/drm/i915/intel_hdmi.c
> index 79582f9..a6310ca 100644
> --- a/drivers/gpu/drm/i915/intel_hdmi.c
> +++ b/drivers/gpu/drm/i915/intel_hdmi.c
> @@ -1292,11 +1292,11 @@ void intel_hdmi_init(struct drm_device *dev, int hdmi_reg, enum port port)
> struct intel_encoder *intel_encoder;
> struct intel_connector *intel_connector;
>
> - intel_dig_port = kzalloc(sizeof(struct intel_digital_port), GFP_KERNEL);
> + intel_dig_port = kzalloc(sizeof(*intel_dig_port), GFP_KERNEL);
> if (!intel_dig_port)
> return;
>
> - intel_connector = kzalloc(sizeof(struct intel_connector), GFP_KERNEL);
> + intel_connector = kzalloc(sizeof(*intel_connector), GFP_KERNEL);
> if (!intel_connector) {
> kfree(intel_dig_port);
> return;
> diff --git a/drivers/gpu/drm/i915/intel_lvds.c b/drivers/gpu/drm/i915/intel_lvds.c
> index 05e5485..639650c 100644
> --- a/drivers/gpu/drm/i915/intel_lvds.c
> +++ b/drivers/gpu/drm/i915/intel_lvds.c
> @@ -948,11 +948,11 @@ void intel_lvds_init(struct drm_device *dev)
> }
> }
>
> - lvds_encoder = kzalloc(sizeof(struct intel_lvds_encoder), GFP_KERNEL);
> + lvds_encoder = kzalloc(sizeof(*lvds_encoder), GFP_KERNEL);
> if (!lvds_encoder)
> return;
>
> - lvds_connector = kzalloc(sizeof(struct intel_lvds_connector), GFP_KERNEL);
> + lvds_connector = kzalloc(sizeof(*lvds_connector), GFP_KERNEL);
> if (!lvds_connector) {
> kfree(lvds_encoder);
> return;
> diff --git a/drivers/gpu/drm/i915/intel_overlay.c b/drivers/gpu/drm/i915/intel_overlay.c
> index 8d6d0a1..a98a990 100644
> --- a/drivers/gpu/drm/i915/intel_overlay.c
> +++ b/drivers/gpu/drm/i915/intel_overlay.c
> @@ -1053,7 +1053,7 @@ int intel_overlay_put_image(struct drm_device *dev, void *data,
> return ret;
> }
>
> - params = kmalloc(sizeof(struct put_image_params), GFP_KERNEL);
> + params = kmalloc(sizeof(*params), GFP_KERNEL);
> if (!params)
> return -ENOMEM;
>
> @@ -1320,7 +1320,7 @@ void intel_setup_overlay(struct drm_device *dev)
> if (!HAS_OVERLAY(dev))
> return;
>
> - overlay = kzalloc(sizeof(struct intel_overlay), GFP_KERNEL);
> + overlay = kzalloc(sizeof(*overlay), GFP_KERNEL);
> if (!overlay)
> return;
>
> diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
> index fe19ba3..6fd2e05 100644
> --- a/drivers/gpu/drm/i915/intel_pm.c
> +++ b/drivers/gpu/drm/i915/intel_pm.c
> @@ -370,7 +370,7 @@ static void intel_enable_fbc(struct drm_crtc *crtc, unsigned long interval)
>
> intel_cancel_fbc_work(dev_priv);
>
> - work = kzalloc(sizeof *work, GFP_KERNEL);
> + work = kzalloc(sizeof(*work), GFP_KERNEL);
> if (work == NULL) {
> DRM_ERROR("Failed to allocate FBC work structure\n");
> dev_priv->display.enable_fbc(crtc, interval);
> diff --git a/drivers/gpu/drm/i915/intel_sdvo.c b/drivers/gpu/drm/i915/intel_sdvo.c
> index 8aa7be5..989cf74 100644
> --- a/drivers/gpu/drm/i915/intel_sdvo.c
> +++ b/drivers/gpu/drm/i915/intel_sdvo.c
> @@ -2388,7 +2388,7 @@ intel_sdvo_dvi_init(struct intel_sdvo *intel_sdvo, int device)
> struct intel_connector *intel_connector;
> struct intel_sdvo_connector *intel_sdvo_connector;
>
> - intel_sdvo_connector = kzalloc(sizeof(struct intel_sdvo_connector), GFP_KERNEL);
> + intel_sdvo_connector = kzalloc(sizeof(*intel_sdvo_connector), GFP_KERNEL);
> if (!intel_sdvo_connector)
> return false;
>
> @@ -2436,7 +2436,7 @@ intel_sdvo_tv_init(struct intel_sdvo *intel_sdvo, int type)
> struct intel_connector *intel_connector;
> struct intel_sdvo_connector *intel_sdvo_connector;
>
> - intel_sdvo_connector = kzalloc(sizeof(struct intel_sdvo_connector), GFP_KERNEL);
> + intel_sdvo_connector = kzalloc(sizeof(*intel_sdvo_connector), GFP_KERNEL);
> if (!intel_sdvo_connector)
> return false;
>
> @@ -2473,7 +2473,7 @@ intel_sdvo_analog_init(struct intel_sdvo *intel_sdvo, int device)
> struct intel_connector *intel_connector;
> struct intel_sdvo_connector *intel_sdvo_connector;
>
> - intel_sdvo_connector = kzalloc(sizeof(struct intel_sdvo_connector), GFP_KERNEL);
> + intel_sdvo_connector = kzalloc(sizeof(*intel_sdvo_connector), GFP_KERNEL);
> if (!intel_sdvo_connector)
> return false;
>
> @@ -2504,7 +2504,7 @@ intel_sdvo_lvds_init(struct intel_sdvo *intel_sdvo, int device)
> struct intel_connector *intel_connector;
> struct intel_sdvo_connector *intel_sdvo_connector;
>
> - intel_sdvo_connector = kzalloc(sizeof(struct intel_sdvo_connector), GFP_KERNEL);
> + intel_sdvo_connector = kzalloc(sizeof(*intel_sdvo_connector), GFP_KERNEL);
> if (!intel_sdvo_connector)
> return false;
>
> @@ -2870,7 +2870,7 @@ bool intel_sdvo_init(struct drm_device *dev, uint32_t sdvo_reg, bool is_sdvob)
> struct intel_encoder *intel_encoder;
> struct intel_sdvo *intel_sdvo;
> int i;
> - intel_sdvo = kzalloc(sizeof(struct intel_sdvo), GFP_KERNEL);
> + intel_sdvo = kzalloc(sizeof(*intel_sdvo), GFP_KERNEL);
> if (!intel_sdvo)
> return false;
>
> diff --git a/drivers/gpu/drm/i915/intel_sprite.c b/drivers/gpu/drm/i915/intel_sprite.c
> index 231b289..cae10bc 100644
> --- a/drivers/gpu/drm/i915/intel_sprite.c
> +++ b/drivers/gpu/drm/i915/intel_sprite.c
> @@ -1034,7 +1034,7 @@ intel_plane_init(struct drm_device *dev, enum pipe pipe, int plane)
> if (INTEL_INFO(dev)->gen < 5)
> return -ENODEV;
>
> - intel_plane = kzalloc(sizeof(struct intel_plane), GFP_KERNEL);
> + intel_plane = kzalloc(sizeof(*intel_plane), GFP_KERNEL);
> if (!intel_plane)
> return -ENOMEM;
>
> diff --git a/drivers/gpu/drm/i915/intel_tv.c b/drivers/gpu/drm/i915/intel_tv.c
> index f2c6d79..adc7801 100644
> --- a/drivers/gpu/drm/i915/intel_tv.c
> +++ b/drivers/gpu/drm/i915/intel_tv.c
> @@ -1582,12 +1582,12 @@ intel_tv_init(struct drm_device *dev)
> (tv_dac_off & TVDAC_STATE_CHG_EN) != 0)
> return;
>
> - intel_tv = kzalloc(sizeof(struct intel_tv), GFP_KERNEL);
> + intel_tv = kzalloc(sizeof(*intel_tv), GFP_KERNEL);
> if (!intel_tv) {
> return;
> }
>
> - intel_connector = kzalloc(sizeof(struct intel_connector), GFP_KERNEL);
> + intel_connector = kzalloc(sizeof(*intel_connector), GFP_KERNEL);
> if (!intel_connector) {
> kfree(intel_tv);
> return;
> --
> 1.8.4.rc3
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx

--
Jani Nikula, Intel Open Source Technology Center