Commit b14c5679 authored by Daniel Vetter's avatar Daniel Vetter

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

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: default avatarJani Nikula <jani.nikula@intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 4821ff14
...@@ -2156,7 +2156,7 @@ drm_add_fake_info_node(struct drm_minor *minor, ...@@ -2156,7 +2156,7 @@ drm_add_fake_info_node(struct drm_minor *minor,
{ {
struct drm_info_node *node; struct drm_info_node *node;
node = kmalloc(sizeof(struct drm_info_node), GFP_KERNEL); node = kmalloc(sizeof(*node), GFP_KERNEL);
if (node == NULL) { if (node == NULL) {
debugfs_remove(ent); debugfs_remove(ent);
return -ENOMEM; return -ENOMEM;
......
...@@ -641,7 +641,7 @@ static int i915_batchbuffer(struct drm_device *dev, void *data, ...@@ -641,7 +641,7 @@ static int i915_batchbuffer(struct drm_device *dev, void *data,
if (batch->num_cliprects) { if (batch->num_cliprects) {
cliprects = kcalloc(batch->num_cliprects, cliprects = kcalloc(batch->num_cliprects,
sizeof(struct drm_clip_rect), sizeof(*cliprects),
GFP_KERNEL); GFP_KERNEL);
if (cliprects == NULL) if (cliprects == NULL)
return -ENOMEM; return -ENOMEM;
...@@ -703,7 +703,7 @@ static int i915_cmdbuffer(struct drm_device *dev, void *data, ...@@ -703,7 +703,7 @@ static int i915_cmdbuffer(struct drm_device *dev, void *data,
if (cmdbuf->num_cliprects) { if (cmdbuf->num_cliprects) {
cliprects = kcalloc(cmdbuf->num_cliprects, cliprects = kcalloc(cmdbuf->num_cliprects,
sizeof(struct drm_clip_rect), GFP_KERNEL); sizeof(*cliprects), GFP_KERNEL);
if (cliprects == NULL) { if (cliprects == NULL) {
ret = -ENOMEM; ret = -ENOMEM;
goto fail_batch_free; goto fail_batch_free;
...@@ -1480,7 +1480,7 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags) ...@@ -1480,7 +1480,7 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags)
dev->types[8] = _DRM_STAT_SECONDARY; dev->types[8] = _DRM_STAT_SECONDARY;
dev->types[9] = _DRM_STAT_DMA; 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) if (dev_priv == NULL)
return -ENOMEM; return -ENOMEM;
......
...@@ -4638,7 +4638,7 @@ static int i915_gem_init_phys_object(struct drm_device *dev, ...@@ -4638,7 +4638,7 @@ static int i915_gem_init_phys_object(struct drm_device *dev,
if (dev_priv->mm.phys_objs[id - 1] || !size) if (dev_priv->mm.phys_objs[id - 1] || !size)
return 0; 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) if (!phys_obj)
return -ENOMEM; return -ENOMEM;
......
...@@ -764,7 +764,7 @@ void intel_crt_init(struct drm_device *dev) ...@@ -764,7 +764,7 @@ void intel_crt_init(struct drm_device *dev)
if (!crt) if (!crt)
return; return;
intel_connector = kzalloc(sizeof(struct intel_connector), GFP_KERNEL); intel_connector = kzalloc(sizeof(*intel_connector), GFP_KERNEL);
if (!intel_connector) { if (!intel_connector) {
kfree(crt); kfree(crt);
return; return;
......
...@@ -1337,11 +1337,11 @@ void intel_ddi_init(struct drm_device *dev, enum port port) ...@@ -1337,11 +1337,11 @@ void intel_ddi_init(struct drm_device *dev, enum port port)
struct intel_connector *hdmi_connector = NULL; struct intel_connector *hdmi_connector = NULL;
struct intel_connector *dp_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) if (!intel_dig_port)
return; return;
dp_connector = kzalloc(sizeof(struct intel_connector), GFP_KERNEL); dp_connector = kzalloc(sizeof(*dp_connector), GFP_KERNEL);
if (!dp_connector) { if (!dp_connector) {
kfree(intel_dig_port); kfree(intel_dig_port);
return; return;
...@@ -1381,7 +1381,7 @@ void intel_ddi_init(struct drm_device *dev, enum port port) ...@@ -1381,7 +1381,7 @@ void intel_ddi_init(struct drm_device *dev, enum port port)
} }
if (intel_encoder->type != INTEL_OUTPUT_EDP) { if (intel_encoder->type != INTEL_OUTPUT_EDP) {
hdmi_connector = kzalloc(sizeof(struct intel_connector), hdmi_connector = kzalloc(sizeof(*hdmi_connector),
GFP_KERNEL); GFP_KERNEL);
if (!hdmi_connector) { if (!hdmi_connector) {
return; return;
......
...@@ -8097,7 +8097,7 @@ static int intel_crtc_page_flip(struct drm_crtc *crtc, ...@@ -8097,7 +8097,7 @@ static int intel_crtc_page_flip(struct drm_crtc *crtc,
fb->pitches[0] != crtc->fb->pitches[0])) fb->pitches[0] != crtc->fb->pitches[0]))
return -EINVAL; return -EINVAL;
work = kzalloc(sizeof *work, GFP_KERNEL); work = kzalloc(sizeof(*work), GFP_KERNEL);
if (work == NULL) if (work == NULL)
return -ENOMEM; return -ENOMEM;
......
...@@ -3625,11 +3625,11 @@ intel_dp_init(struct drm_device *dev, int output_reg, enum port port) ...@@ -3625,11 +3625,11 @@ intel_dp_init(struct drm_device *dev, int output_reg, enum port port)
struct drm_encoder *encoder; struct drm_encoder *encoder;
struct intel_connector *intel_connector; 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) if (!intel_dig_port)
return; return;
intel_connector = kzalloc(sizeof(struct intel_connector), GFP_KERNEL); intel_connector = kzalloc(sizeof(*intel_connector), GFP_KERNEL);
if (!intel_connector) { if (!intel_connector) {
kfree(intel_dig_port); kfree(intel_dig_port);
return; return;
......
...@@ -448,11 +448,11 @@ void intel_dvo_init(struct drm_device *dev) ...@@ -448,11 +448,11 @@ void intel_dvo_init(struct drm_device *dev)
int i; int i;
int encoder_type = DRM_MODE_ENCODER_NONE; 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) if (!intel_dvo)
return; return;
intel_connector = kzalloc(sizeof(struct intel_connector), GFP_KERNEL); intel_connector = kzalloc(sizeof(*intel_connector), GFP_KERNEL);
if (!intel_connector) { if (!intel_connector) {
kfree(intel_dvo); kfree(intel_dvo);
return; return;
......
...@@ -216,7 +216,7 @@ int intel_fbdev_init(struct drm_device *dev) ...@@ -216,7 +216,7 @@ int intel_fbdev_init(struct drm_device *dev)
struct drm_i915_private *dev_priv = dev->dev_private; struct drm_i915_private *dev_priv = dev->dev_private;
int ret; int ret;
ifbdev = kzalloc(sizeof(struct intel_fbdev), GFP_KERNEL); ifbdev = kzalloc(sizeof(*ifbdev), GFP_KERNEL);
if (!ifbdev) if (!ifbdev)
return -ENOMEM; return -ENOMEM;
......
...@@ -1292,11 +1292,11 @@ void intel_hdmi_init(struct drm_device *dev, int hdmi_reg, enum port port) ...@@ -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_encoder *intel_encoder;
struct intel_connector *intel_connector; 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) if (!intel_dig_port)
return; return;
intel_connector = kzalloc(sizeof(struct intel_connector), GFP_KERNEL); intel_connector = kzalloc(sizeof(*intel_connector), GFP_KERNEL);
if (!intel_connector) { if (!intel_connector) {
kfree(intel_dig_port); kfree(intel_dig_port);
return; return;
......
...@@ -948,11 +948,11 @@ void intel_lvds_init(struct drm_device *dev) ...@@ -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) if (!lvds_encoder)
return; return;
lvds_connector = kzalloc(sizeof(struct intel_lvds_connector), GFP_KERNEL); lvds_connector = kzalloc(sizeof(*lvds_connector), GFP_KERNEL);
if (!lvds_connector) { if (!lvds_connector) {
kfree(lvds_encoder); kfree(lvds_encoder);
return; return;
......
...@@ -1053,7 +1053,7 @@ int intel_overlay_put_image(struct drm_device *dev, void *data, ...@@ -1053,7 +1053,7 @@ int intel_overlay_put_image(struct drm_device *dev, void *data,
return ret; return ret;
} }
params = kmalloc(sizeof(struct put_image_params), GFP_KERNEL); params = kmalloc(sizeof(*params), GFP_KERNEL);
if (!params) if (!params)
return -ENOMEM; return -ENOMEM;
...@@ -1320,7 +1320,7 @@ void intel_setup_overlay(struct drm_device *dev) ...@@ -1320,7 +1320,7 @@ void intel_setup_overlay(struct drm_device *dev)
if (!HAS_OVERLAY(dev)) if (!HAS_OVERLAY(dev))
return; return;
overlay = kzalloc(sizeof(struct intel_overlay), GFP_KERNEL); overlay = kzalloc(sizeof(*overlay), GFP_KERNEL);
if (!overlay) if (!overlay)
return; return;
......
...@@ -370,7 +370,7 @@ static void intel_enable_fbc(struct drm_crtc *crtc, unsigned long interval) ...@@ -370,7 +370,7 @@ static void intel_enable_fbc(struct drm_crtc *crtc, unsigned long interval)
intel_cancel_fbc_work(dev_priv); intel_cancel_fbc_work(dev_priv);
work = kzalloc(sizeof *work, GFP_KERNEL); work = kzalloc(sizeof(*work), GFP_KERNEL);
if (work == NULL) { if (work == NULL) {
DRM_ERROR("Failed to allocate FBC work structure\n"); DRM_ERROR("Failed to allocate FBC work structure\n");
dev_priv->display.enable_fbc(crtc, interval); dev_priv->display.enable_fbc(crtc, interval);
......
...@@ -2397,7 +2397,7 @@ intel_sdvo_dvi_init(struct intel_sdvo *intel_sdvo, int device) ...@@ -2397,7 +2397,7 @@ intel_sdvo_dvi_init(struct intel_sdvo *intel_sdvo, int device)
struct intel_connector *intel_connector; struct intel_connector *intel_connector;
struct intel_sdvo_connector *intel_sdvo_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) if (!intel_sdvo_connector)
return false; return false;
...@@ -2445,7 +2445,7 @@ intel_sdvo_tv_init(struct intel_sdvo *intel_sdvo, int type) ...@@ -2445,7 +2445,7 @@ intel_sdvo_tv_init(struct intel_sdvo *intel_sdvo, int type)
struct intel_connector *intel_connector; struct intel_connector *intel_connector;
struct intel_sdvo_connector *intel_sdvo_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) if (!intel_sdvo_connector)
return false; return false;
...@@ -2482,7 +2482,7 @@ intel_sdvo_analog_init(struct intel_sdvo *intel_sdvo, int device) ...@@ -2482,7 +2482,7 @@ intel_sdvo_analog_init(struct intel_sdvo *intel_sdvo, int device)
struct intel_connector *intel_connector; struct intel_connector *intel_connector;
struct intel_sdvo_connector *intel_sdvo_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) if (!intel_sdvo_connector)
return false; return false;
...@@ -2513,7 +2513,7 @@ intel_sdvo_lvds_init(struct intel_sdvo *intel_sdvo, int device) ...@@ -2513,7 +2513,7 @@ intel_sdvo_lvds_init(struct intel_sdvo *intel_sdvo, int device)
struct intel_connector *intel_connector; struct intel_connector *intel_connector;
struct intel_sdvo_connector *intel_sdvo_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) if (!intel_sdvo_connector)
return false; return false;
...@@ -2879,7 +2879,7 @@ bool intel_sdvo_init(struct drm_device *dev, uint32_t sdvo_reg, bool is_sdvob) ...@@ -2879,7 +2879,7 @@ bool intel_sdvo_init(struct drm_device *dev, uint32_t sdvo_reg, bool is_sdvob)
struct intel_encoder *intel_encoder; struct intel_encoder *intel_encoder;
struct intel_sdvo *intel_sdvo; struct intel_sdvo *intel_sdvo;
int i; int i;
intel_sdvo = kzalloc(sizeof(struct intel_sdvo), GFP_KERNEL); intel_sdvo = kzalloc(sizeof(*intel_sdvo), GFP_KERNEL);
if (!intel_sdvo) if (!intel_sdvo)
return false; return false;
......
...@@ -1034,7 +1034,7 @@ intel_plane_init(struct drm_device *dev, enum pipe pipe, int plane) ...@@ -1034,7 +1034,7 @@ intel_plane_init(struct drm_device *dev, enum pipe pipe, int plane)
if (INTEL_INFO(dev)->gen < 5) if (INTEL_INFO(dev)->gen < 5)
return -ENODEV; return -ENODEV;
intel_plane = kzalloc(sizeof(struct intel_plane), GFP_KERNEL); intel_plane = kzalloc(sizeof(*intel_plane), GFP_KERNEL);
if (!intel_plane) if (!intel_plane)
return -ENOMEM; return -ENOMEM;
......
...@@ -1590,12 +1590,12 @@ intel_tv_init(struct drm_device *dev) ...@@ -1590,12 +1590,12 @@ intel_tv_init(struct drm_device *dev)
(tv_dac_off & TVDAC_STATE_CHG_EN) != 0) (tv_dac_off & TVDAC_STATE_CHG_EN) != 0)
return; return;
intel_tv = kzalloc(sizeof(struct intel_tv), GFP_KERNEL); intel_tv = kzalloc(sizeof(*intel_tv), GFP_KERNEL);
if (!intel_tv) { if (!intel_tv) {
return; return;
} }
intel_connector = kzalloc(sizeof(struct intel_connector), GFP_KERNEL); intel_connector = kzalloc(sizeof(*intel_connector), GFP_KERNEL);
if (!intel_connector) { if (!intel_connector) {
kfree(intel_tv); kfree(intel_tv);
return; return;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment