| Message ID | 1409307166-12396-17-git-send-email-dh.herrmann@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Fri, Aug 29, 2014 at 12:12:42PM +0200, David Herrmann wrote: > 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> > --- > drivers/gpu/drm/drm_ioctl.c | 1 - > drivers/gpu/drm/drm_pci.c | 4 +--- > drivers/gpu/drm/drm_platform.c | 1 - > include/drm/drmP.h | 2 -- > 4 files changed, 1 insertion(+), 7 deletions(-) Now that's what I get for not reading mails in advance. Anyway I'm glad we agree on the uselessness of unique_size. =) Reviewed-by: Thierry Reding <treding@nvidia.com>
On Fri, Aug 29, 2014 at 12:12:42PM +0200, David Herrmann wrote: > 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: Daniel Vetter <daniel.vetter@ffwll.ch> > --- > drivers/gpu/drm/drm_ioctl.c | 1 - > drivers/gpu/drm/drm_pci.c | 4 +--- > drivers/gpu/drm/drm_platform.c | 1 - > include/drm/drmP.h | 2 -- > 4 files changed, 1 insertion(+), 7 deletions(-) > > diff --git a/drivers/gpu/drm/drm_ioctl.c b/drivers/gpu/drm/drm_ioctl.c > index aa1ac79..cb6b54a 100644 > --- a/drivers/gpu/drm/drm_ioctl.c > +++ b/drivers/gpu/drm/drm_ioctl.c > @@ -189,7 +189,6 @@ drm_unset_busid(struct drm_device *dev, > kfree(master->unique); > master->unique = NULL; > master->unique_len = 0; > - master->unique_size = 0; > } > > /** > diff --git a/drivers/gpu/drm/drm_pci.c b/drivers/gpu/drm/drm_pci.c > index 8efea6b..e266927 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; > diff --git a/drivers/gpu/drm/drm_platform.c b/drivers/gpu/drm/drm_platform.c > index 0c09ddd..f197a2b 100644 > --- a/drivers/gpu/drm/drm_platform.c > +++ b/drivers/gpu/drm/drm_platform.c > @@ -82,7 +82,6 @@ static int drm_platform_set_busid(struct drm_device *dev, struct drm_master *mas > return -ENOMEM; > > master->unique_len = strlen(master->unique); > - master->unique_size = master->unique_len; > return 0; > } > > diff --git a/include/drm/drmP.h b/include/drm/drmP.h > index a8b24fc..98b1eaf 100644 > --- a/include/drm/drmP.h > +++ b/include/drm/drmP.h > @@ -574,7 +574,6 @@ struct drm_gem_object { > * @minor: Link back to minor char device we are master for. Immutable. > * @unique: Unique identifier: e.g. busid. Protected by drm_global_mutex. > * @unique_len: Length of unique field. Protected by drm_global_mutex. > - * @unique_size: Amount allocated. Protected by drm_global_mutex. > * @magiclist: Hash of used authentication tokens. Protected by struct_mutex. > * @magicfree: List of used authentication tokens. Protected by struct_mutex. > * @lock: DRI lock information. > @@ -585,7 +584,6 @@ struct drm_master { > struct drm_minor *minor; > char *unique; > int unique_len; > - int unique_size; > struct drm_open_hash magiclist; > struct list_head magicfree; > struct drm_lock_data lock; > -- > 2.1.0 >
diff --git a/drivers/gpu/drm/drm_ioctl.c b/drivers/gpu/drm/drm_ioctl.c index aa1ac79..cb6b54a 100644 --- a/drivers/gpu/drm/drm_ioctl.c +++ b/drivers/gpu/drm/drm_ioctl.c @@ -189,7 +189,6 @@ drm_unset_busid(struct drm_device *dev, kfree(master->unique); master->unique = NULL; master->unique_len = 0; - master->unique_size = 0; } /** diff --git a/drivers/gpu/drm/drm_pci.c b/drivers/gpu/drm/drm_pci.c index 8efea6b..e266927 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; diff --git a/drivers/gpu/drm/drm_platform.c b/drivers/gpu/drm/drm_platform.c index 0c09ddd..f197a2b 100644 --- a/drivers/gpu/drm/drm_platform.c +++ b/drivers/gpu/drm/drm_platform.c @@ -82,7 +82,6 @@ static int drm_platform_set_busid(struct drm_device *dev, struct drm_master *mas return -ENOMEM; master->unique_len = strlen(master->unique); - master->unique_size = master->unique_len; return 0; } diff --git a/include/drm/drmP.h b/include/drm/drmP.h index a8b24fc..98b1eaf 100644 --- a/include/drm/drmP.h +++ b/include/drm/drmP.h @@ -574,7 +574,6 @@ struct drm_gem_object { * @minor: Link back to minor char device we are master for. Immutable. * @unique: Unique identifier: e.g. busid. Protected by drm_global_mutex. * @unique_len: Length of unique field. Protected by drm_global_mutex. - * @unique_size: Amount allocated. Protected by drm_global_mutex. * @magiclist: Hash of used authentication tokens. Protected by struct_mutex. * @magicfree: List of used authentication tokens. Protected by struct_mutex. * @lock: DRI lock information. @@ -585,7 +584,6 @@ struct drm_master { struct drm_minor *minor; char *unique; int unique_len; - int unique_size; struct drm_open_hash magiclist; struct list_head magicfree; struct drm_lock_data lock;
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> --- drivers/gpu/drm/drm_ioctl.c | 1 - drivers/gpu/drm/drm_pci.c | 4 +--- drivers/gpu/drm/drm_platform.c | 1 - include/drm/drmP.h | 2 -- 4 files changed, 1 insertion(+), 7 deletions(-)