1 files changed, 10 insertions, 31 deletions

diff --git a/drivers/gpu/drm/drm_pci.c b/drivers/gpu/drm/drm_pci.c
index 020cfd934854..7563130c6b70 100644
--- a/drivers/gpu/drm/drm_pci.c
+++ b/drivers/gpu/drm/drm_pci.c
@@ -127,34 +127,20 @@ static int drm_get_pci_domain(struct drm_device *dev)
         return pci_domain_nr(dev->pdev->bus);
 }
 
-static int drm_pci_set_busid(struct drm_device *dev, struct drm_master *master)
+int drm_pci_set_busid(struct drm_device *dev, struct drm_master *master)
 {
-        int len, ret;
-        master->unique_len = 40;
-        master->unique_size = master->unique_len;
-        master->unique = kmalloc(master->unique_size, GFP_KERNEL);
-        if (master->unique == NULL)
+        master->unique = kasprintf(GFP_KERNEL, "pci:%04x:%02x:%02x.%d",
+                                        drm_get_pci_domain(dev),
+                                        dev->pdev->bus->number,
+                                        PCI_SLOT(dev->pdev->devfn),
+                                        PCI_FUNC(dev->pdev->devfn));
+        if (!master->unique)
                 return -ENOMEM;
 
-
-        len = snprintf(master->unique, master->unique_len,
-                       "pci:%04x:%02x:%02x.%d",
-                       drm_get_pci_domain(dev),
-                       dev->pdev->bus->number,
-                       PCI_SLOT(dev->pdev->devfn),
-                       PCI_FUNC(dev->pdev->devfn));
-
-        if (len >= master->unique_len) {
-                DRM_ERROR("buffer overflow");
-                ret = -EINVAL;
-                goto err;
-        } else
-                master->unique_len = len;
-
+        master->unique_len = strlen(master->unique);
         return 0;
-err:
-        return ret;
 }
+EXPORT_SYMBOL(drm_pci_set_busid);
 
 int drm_pci_set_unique(struct drm_device *dev,
                        struct drm_master *master,
@@ -163,8 +149,7 @@ int drm_pci_set_unique(struct drm_device *dev,
         int domain, bus, slot, func, ret;
 
         master->unique_len = u->unique_len;
-        master->unique_size = u->unique_len + 1;
-        master->unique = kmalloc(master->unique_size, GFP_KERNEL);
+        master->unique = kmalloc(master->unique_len + 1, GFP_KERNEL);
         if (!master->unique) {
                 ret = -ENOMEM;
                 goto err;
@@ -269,10 +254,6 @@ void drm_pci_agp_destroy(struct drm_device *dev)
         }
 }
 
-static struct drm_bus drm_pci_bus = {
-        .set_busid = drm_pci_set_busid,
-};
-
 /**
  * drm_get_pci_dev - Register a PCI device with the DRM subsystem
  * @pdev: PCI device
@@ -353,8 +334,6 @@ int drm_pci_init(struct drm_driver *driver, struct pci_driver *pdriver)
 
         DRM_DEBUG("\n");
 
-        driver->bus = &drm_pci_bus;
-
         if (driver->driver_features & DRIVER_MODESET)
                 return pci_register_driver(pdriver);