Commit b14c5679 authored by Daniel Vetter's avatar Daniel Vetter
Browse files

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

drivers/gpu/drm/i915/i915_debugfs.c

+1 −1
Original line number Diff line number Diff line
@@ -2156,7 +2156,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;

drivers/gpu/drm/i915/i915_dma.c

+3 −3
Original line number Diff line number Diff line
@@ -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;
@@ -1480,7 +1480,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;

drivers/gpu/drm/i915/i915_gem.c

+1 −1
Original line number Diff line number Diff line
@@ -4638,7 +4638,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;

drivers/gpu/drm/i915/intel_crt.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

drivers/gpu/drm/i915/intel_ddi.c

+3 −3
Original line number Diff line number Diff line
@@ -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;

CRA Git | Maintained and supported by SUSTech CRA and CCSE