aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/drm_pci.c
diff options
context:
space:
mode:
authorDavid Herrmann <dh.herrmann@gmail.com>2014-08-29 12:12:42 +0200
committerDave Airlie <airlied@redhat.com>2014-09-10 17:42:17 +1000
commit1e444be0ef1bda2b180ecdedfa4c5d32bf236a5d (patch)
tree711321e9be107eb0ee0220176cbe912b14864e76 /drivers/gpu/drm/drm_pci.c
parentdrm: simplify drm_*_set_unique() (diff)
downloadlinux-dev-1e444be0ef1bda2b180ecdedfa4c5d32bf236a5d.tar.xz
linux-dev-1e444be0ef1bda2b180ecdedfa4c5d32bf236a5d.zip
drm: drop unused drm_master->unique_size
This field is unused and there is really no reason to optimize unique-allocations. Drop it. Signed-off-by: David Herrmann <dh.herrmann@gmail.com> Reviewed-by: Thierry Reding <treding@nvidia.com> Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch> Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/drm_pci.c')
-rw-r--r--drivers/gpu/drm/drm_pci.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/gpu/drm/drm_pci.c b/drivers/gpu/drm/drm_pci.c
index 8efea6b4602b..e266927bb9f1 100644
--- a/drivers/gpu/drm/drm_pci.c
+++ b/drivers/gpu/drm/drm_pci.c
@@ -138,7 +138,6 @@ static int drm_pci_set_busid(struct drm_device *dev, struct drm_master *master)
return -ENOMEM;
master->unique_len = strlen(master->unique);
- master->unique_size = master->unique_len + 1;
return 0;
}
@@ -149,8 +148,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;