From: Tomi Valkeinen <tomi.valkeinen@ti.com>
Date: Wed, 16 Aug 2017 12:43:55 +0300
Subject: drm/omap: rename omapdrm device back
Git-commit: f64eafa0c82e4dfca68dad61889a63770ef75e07
Patch-mainline: v4.14-rc1
References: FATE#326289 FATE#326079 FATE#326049 FATE#322398 FATE#326166

Now that creating the omapdrm device from the platform code has been
removed, we can rename the omapdrm device back to "omapdrm".

Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Acked-by: Petr Tesarik <ptesarik@suse.com>
---
 drivers/gpu/drm/omapdrm/dss/core.c |    2 +-
 drivers/gpu/drm/omapdrm/omap_drv.c |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

--- a/drivers/gpu/drm/omapdrm/dss/core.c
+++ b/drivers/gpu/drm/omapdrm/dss/core.c
@@ -77,7 +77,7 @@ static int __init omap_dss_init(void)
 			goto err_reg;
 	}
 
-	omap_drm_device = platform_device_register_simple("omapdrm_", 0, NULL, 0);
+	omap_drm_device = platform_device_register_simple("omapdrm", 0, NULL, 0);
 	if (IS_ERR(omap_drm_device)) {
 		r = PTR_ERR(omap_drm_device);
 		goto err_reg;
--- a/drivers/gpu/drm/omapdrm/omap_drv.c
+++ b/drivers/gpu/drm/omapdrm/omap_drv.c
@@ -768,7 +768,7 @@ static SIMPLE_DEV_PM_OPS(omapdrm_pm_ops,
 
 static struct platform_driver pdev = {
 	.driver = {
-		.name = "omapdrm_",
+		.name = "omapdrm",
 		.pm = &omapdrm_pm_ops,
 	},
 	.probe = pdev_probe,