drm: rip out dev->devname

This was only ever used to pretty-print the irq driver name. And on
kms systems due to set_version bonghits we never set up the prettier
name, ever. Which make this a bit pointless.

Also, we can always dig out the driver-instance/irq relationship
through other means, so this isn't that useful. So just rip it out to
simplify the set_version/set_busid insanity a bit.

Also delete the temporary busname from drm_pci_set_busid, it's now
unused.

v2: Rebase on top of the new host1x drm_bus for tegra.

Reviewed-by: Thierry Reding <treding@nvidia.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>

7 files changed, 1 insertions, 62 deletions

diff --git a/drivers/gpu/drm/drm_ioctl.c b/drivers/gpu/drm/drm_ioctl.c
index 53560ef53f99..38269d5aa333 100644
--- a/drivers/gpu/drm/drm_ioctl.c
+++ b/drivers/gpu/drm/drm_ioctl.c
@@ -72,9 +72,6 @@ static void
 drm_unset_busid(struct drm_device *dev,
                 struct drm_master *master)
 {
-        kfree(dev->devname);
-        dev->devname = NULL;
-
         kfree(master->unique);
         master->unique = NULL;
         master->unique_len = 0;
diff --git a/drivers/gpu/drm/drm_irq.c b/drivers/gpu/drm/drm_irq.c
index de38bc9b6581..7583767ec619 100644
--- a/drivers/gpu/drm/drm_irq.c
+++ b/drivers/gpu/drm/drm_irq.c
@@ -246,7 +246,6 @@ int drm_irq_install(struct drm_device *dev, int irq)
 {
         int ret;
         unsigned long sh_flags = 0;
-        char *irqname;
 
         if (!drm_core_check_feature(dev, DRIVER_HAVE_IRQ))
                 return -EINVAL;
@@ -272,13 +271,8 @@ int drm_irq_install(struct drm_device *dev, int irq)
         if (drm_core_check_feature(dev, DRIVER_IRQ_SHARED))
                 sh_flags = IRQF_SHARED;
 
-        if (dev->devname)
-                irqname = dev->devname;
-        else
-                irqname = dev->driver->name;
-
         ret = request_irq(irq, dev->driver->irq_handler,
-                          sh_flags, irqname, dev);
+                          sh_flags, dev->driver->name, dev);
 
         if (ret < 0) {
                 dev->irq_enabled = false;
diff --git a/drivers/gpu/drm/drm_pci.c b/drivers/gpu/drm/drm_pci.c
index c550b349f202..047c51046d94 100644
--- a/drivers/gpu/drm/drm_pci.c
+++ b/drivers/gpu/drm/drm_pci.c
@@ -146,7 +146,6 @@ static const char *drm_pci_get_name(struct drm_device *dev)
 static int drm_pci_set_busid(struct drm_device *dev, struct drm_master *master)
 {
         int len, ret;
-        struct pci_driver *pdriver = dev->driver->kdriver.pci;
         master->unique_len = 40;
         master->unique_size = master->unique_len;
         master->unique = kmalloc(master->unique_size, GFP_KERNEL);
@@ -168,18 +167,6 @@ static int drm_pci_set_busid(struct drm_device *dev, struct drm_master *master)
         } else
                 master->unique_len = len;
 
-        dev->devname =
-                kmalloc(strlen(pdriver->name) +
-                        master->unique_len + 2, GFP_KERNEL);
-
-        if (dev->devname == NULL) {
-                ret = -ENOMEM;
-                goto err;
-        }
-
-        sprintf(dev->devname, "%s@%s", pdriver->name,
-                master->unique);
-
         return 0;
 err:
         return ret;
@@ -190,7 +177,6 @@ int drm_pci_set_unique(struct drm_device *dev,
                        struct drm_unique *u)
 {
         int domain, bus, slot, func, ret;
-        const char *bus_name;
 
         master->unique_len = u->unique_len;
         master->unique_size = u->unique_len + 1;
@@ -207,17 +193,6 @@ int drm_pci_set_unique(struct drm_device *dev,
 
         master->unique[master->unique_len] = '\0';
 
-        bus_name = dev->driver->bus->get_name(dev);
-        dev->devname = kmalloc(strlen(bus_name) +
-                               strlen(master->unique) + 2, GFP_KERNEL);
-        if (!dev->devname) {
-                ret = -ENOMEM;
-                goto err;
-        }
-
-        sprintf(dev->devname, "%s@%s", bus_name,
-                master->unique);
-
         /* Return error if the busid submitted doesn't match the device's actual
          * busid.
          */
diff --git a/drivers/gpu/drm/drm_platform.c b/drivers/gpu/drm/drm_platform.c
index 5b918212b1c3..b97b11ea2dc4 100644
--- a/drivers/gpu/drm/drm_platform.c
+++ b/drivers/gpu/drm/drm_platform.c
@@ -101,17 +101,6 @@ static int drm_platform_set_busid(struct drm_device *dev, struct drm_master *mas
                 goto err;
         }
 
-        dev->devname =
-                kmalloc(strlen(dev->platformdev->name) +
-                        master->unique_len + 2, GFP_KERNEL);
-
-        if (dev->devname == NULL) {
-                ret = -ENOMEM;
-                goto err;
-        }
-
-        sprintf(dev->devname, "%s@%s", dev->platformdev->name,
-                master->unique);
         return 0;
 err:
         return ret;
diff --git a/drivers/gpu/drm/drm_stub.c b/drivers/gpu/drm/drm_stub.c
index 5394b201c3d0..3a8e832ad151 100644
--- a/drivers/gpu/drm/drm_stub.c
+++ b/drivers/gpu/drm/drm_stub.c
@@ -166,9 +166,6 @@ static void drm_master_destroy(struct kref *kref)
                 master->unique_len = 0;
         }
 
-        kfree(dev->devname);
-        dev->devname = NULL;
-
         list_for_each_entry_safe(pt, next, &master->magicfree, head) {
                 list_del(&pt->head);
                 drm_ht_remove_item(&master->magiclist, &pt->hash_item);
@@ -648,8 +645,6 @@ static void drm_dev_release(struct kref *ref)
         drm_minor_free(dev, DRM_MINOR_RENDER);
         drm_minor_free(dev, DRM_MINOR_CONTROL);
 
-        kfree(dev->devname);
-
         mutex_destroy(&dev->master_mutex);
         kfree(dev);
 }
diff --git a/drivers/gpu/drm/tegra/bus.c b/drivers/gpu/drm/tegra/bus.c
index 6916fa51cfa4..b3a66d65cb53 100644
--- a/drivers/gpu/drm/tegra/bus.c
+++ b/drivers/gpu/drm/tegra/bus.c
@@ -12,9 +12,7 @@ static int drm_host1x_set_busid(struct drm_device *dev,
                                 struct drm_master *master)
 {
         const char *device = dev_name(dev->dev);
-        const char *driver = dev->driver->name;
         const char *bus = dev->dev->bus->name;
-        int length;
 
         master->unique_len = strlen(bus) + 1 + strlen(device);
         master->unique_size = master->unique_len;
@@ -25,14 +23,6 @@ static int drm_host1x_set_busid(struct drm_device *dev,
 
         snprintf(master->unique, master->unique_len + 1, "%s:%s", bus, device);
 
-        length = strlen(driver) + 1 + master->unique_len;
-
-        dev->devname = kmalloc(length + 1, GFP_KERNEL);
-        if (!dev->devname)
-                return -ENOMEM;
-
-        snprintf(dev->devname, length + 1, "%s@%s", driver, master->unique);
-
         return 0;
 }
 
diff --git a/include/drm/drmP.h b/include/drm/drmP.h
index 1a9d509bef66..56b028d6bc98 100644
--- a/include/drm/drmP.h
+++ b/include/drm/drmP.h
@@ -1048,7 +1048,6 @@ struct drm_vblank_crtc {
  */
 struct drm_device {
         struct list_head legacy_dev_list;/**< list of devices per driver for stealth attach cleanup */
-        char *devname;                  /**< For /proc/interrupts */
         int if_version;                 /**< Highest interface version set */
 
         /** \name Lifetime Management */