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

Commit 75f6dfe3 authored by Gabriel Krisman Bertazi's avatar Gabriel Krisman Bertazi Committed by Daniel Vetter
Browse files

drm: Deduplicate driver initialization message 



Several DRM drivers print the same initialization message right after
drm_dev_register, so move that to common code.  The exception is i915,
which uses its own register handle, so let it keep its own message.

Notice that this was tested only with Exynos, but looks simple enough
for the other drivers.

Signed-off-by: default avatarGabriel Krisman Bertazi <krisman@collabora.co.uk>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Link: http://patchwork.freedesktop.org/patch/msgid/20161228143216.26821-2-krisman@collabora.co.uk
parent e82dfa00

drivers/gpu/drm/armada/armada_drv.c

+0 −6
Original line number Diff line number Diff line
@@ -203,12 +203,6 @@ static int armada_drm_bind(struct device *dev) 
	armada_drm_debugfs_init(priv->drm.primary);

#endif



	DRM_INFO("Initialized %s %d.%d.%d %s for %s on minor %d\n",

		 armada_drm_driver.name, armada_drm_driver.major,

		 armada_drm_driver.minor, armada_drm_driver.patchlevel,

		 armada_drm_driver.date, dev_name(dev),

		 priv->drm.primary->index);



	return 0;



 err_poll:

drivers/gpu/drm/drm_drv.c

+7 −0
Original line number Diff line number Diff line
@@ -728,6 +728,7 @@ static void remove_compat_control_link(struct drm_device *dev) 
 */

int drm_dev_register(struct drm_device *dev, unsigned long flags)

{

	struct drm_driver *driver = dev->driver;

	int ret;



	mutex_lock(&drm_global_mutex);
@@ -758,6 +759,12 @@ int drm_dev_register(struct drm_device *dev, unsigned long flags) 
		drm_modeset_register_all(dev);



	ret = 0;



	DRM_INFO("Initialized %s %d.%d.%d %s for %s on minor %d\n",

		 driver->name, driver->major, driver->minor,

		 driver->patchlevel, driver->date, dev_name(dev->dev),

		 dev->primary->index);



	goto out_unlock;



err_minors:

drivers/gpu/drm/drm_pci.c

+0 −4
Original line number Diff line number Diff line
@@ -257,10 +257,6 @@ int drm_get_pci_dev(struct pci_dev *pdev, const struct pci_device_id *ent, 
	if (ret)

		goto err_agp;



	DRM_INFO("Initialized %s %d.%d.%d %s for %s on minor %d\n",

		 driver->name, driver->major, driver->minor, driver->patchlevel,

		 driver->date, pci_name(pdev), dev->primary->index);



	/* No locking needed since shadow-attach is single-threaded since it may

	 * only be called from the per-driver module init hook. */

	if (drm_core_check_feature(dev, DRIVER_LEGACY))

drivers/gpu/drm/drm_platform.c

+0 −4
Original line number Diff line number Diff line
@@ -57,10 +57,6 @@ static int drm_get_platform_dev(struct platform_device *platdev, 
	if (ret)

		goto err_free;



	DRM_INFO("Initialized %s %d.%d.%d %s on minor %d\n",

		 driver->name, driver->major, driver->minor, driver->patchlevel,

		 driver->date, dev->primary->index);



	return 0;



err_free:

drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c

+0 −4
Original line number Diff line number Diff line
@@ -415,10 +415,6 @@ static int fsl_dcu_drm_probe(struct platform_device *pdev) 
	if (ret < 0)

		goto unref;



	DRM_INFO("Initialized %s %d.%d.%d %s on minor %d\n", driver->name,

		 driver->major, driver->minor, driver->patchlevel,

		 driver->date, drm->primary->index);



	return 0;



unref: