Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f2c9677b authored by Daniel Kurtz's avatar Daniel Kurtz Committed by Daniel Vetter
Browse files

drm/i915/intel_i2c: allocate gmbus array as part of drm_i915_private 



This memory is always allocated, and it is always a fixed size, so just
allocate it along with the rest of the driver state.

Signed-off-by: default avatarDaniel Kurtz <djkurtz@chromium.org>
Reviewed-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 2ed06c93

drivers/gpu/drm/i915/i915_drv.h

+1 −1
Original line number Diff line number Diff line
@@ -326,7 +326,7 @@ typedef struct drm_i915_private { 
	/** gt_lock is also taken in irq contexts. */

	struct spinlock gt_lock;



	struct intel_gmbus *gmbus;

	struct intel_gmbus gmbus[GMBUS_NUM_PORTS];



	/** gmbus_mutex protects against concurrent usage of the single hw gmbus

	 * controller on different i2c buses. */

drivers/gpu/drm/i915/intel_i2c.c

+0 −10
Original line number Diff line number Diff line
@@ -387,11 +387,6 @@ int intel_setup_gmbus(struct drm_device *dev) 
	else

		dev_priv->gpio_mmio_base = 0;



	dev_priv->gmbus = kcalloc(GMBUS_NUM_PORTS, sizeof(struct intel_gmbus),

				  GFP_KERNEL);

	if (dev_priv->gmbus == NULL)

		return -ENOMEM;



	mutex_init(&dev_priv->gmbus_mutex);



	for (i = 0; i < GMBUS_NUM_PORTS; i++) {
@@ -428,8 +423,6 @@ err: 
		struct intel_gmbus *bus = &dev_priv->gmbus[i];

		i2c_del_adapter(&bus->adapter);

	}

	kfree(dev_priv->gmbus);

	dev_priv->gmbus = NULL;

	return ret;

}
@@ -468,7 +461,4 @@ void intel_teardown_gmbus(struct drm_device *dev) 
		struct intel_gmbus *bus = &dev_priv->gmbus[i];

		i2c_del_adapter(&bus->adapter);

	}



	kfree(dev_priv->gmbus);

	dev_priv->gmbus = NULL;

}