aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSeth Jennings <sjenning@linux.vnet.ibm.com>2013-01-30 10:36:52 -0500
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-01-30 12:22:41 -0500
commit0d145a501778042d0411c843ed5b468b41f8a171 (patch)
treea8bf91ab745da584ef1cbe9ef634e5dece41b8c6
parent5ccac0fd59877c5b9583e7167edef9ddcf21b443 (diff)
staging: zsmalloc: remove unused pool name
zs_create_pool() currently takes a name argument which is never used in any useful way. This patch removes it. Signed-off-by: Seth Jennings <sjenning@linux.vnet.ibm.com> Acked-by: Nitin Gupta <ngupta@vflare.org> Acked-by: Rik van Riel <riel@redhat.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/staging/zram/zram_drv.c2
-rw-r--r--drivers/staging/zsmalloc/zsmalloc-main.c10
-rw-r--r--drivers/staging/zsmalloc/zsmalloc.h2
3 files changed, 4 insertions, 10 deletions
diff --git a/drivers/staging/zram/zram_drv.c b/drivers/staging/zram/zram_drv.c
index 77a3f0dfba77..941b7c62ea20 100644
--- a/drivers/staging/zram/zram_drv.c
+++ b/drivers/staging/zram/zram_drv.c
@@ -575,7 +575,7 @@ int zram_init_device(struct zram *zram)
575 /* zram devices sort of resembles non-rotational disks */ 575 /* zram devices sort of resembles non-rotational disks */
576 queue_flag_set_unlocked(QUEUE_FLAG_NONROT, zram->disk->queue); 576 queue_flag_set_unlocked(QUEUE_FLAG_NONROT, zram->disk->queue);
577 577
578 zram->mem_pool = zs_create_pool("zram", GFP_NOIO | __GFP_HIGHMEM); 578 zram->mem_pool = zs_create_pool(GFP_NOIO | __GFP_HIGHMEM);
579 if (!zram->mem_pool) { 579 if (!zram->mem_pool) {
580 pr_err("Error creating memory pool\n"); 580 pr_err("Error creating memory pool\n");
581 ret = -ENOMEM; 581 ret = -ENOMEM;
diff --git a/drivers/staging/zsmalloc/zsmalloc-main.c b/drivers/staging/zsmalloc/zsmalloc-main.c
index 4666609fa65e..06f73a93a44d 100644
--- a/drivers/staging/zsmalloc/zsmalloc-main.c
+++ b/drivers/staging/zsmalloc/zsmalloc-main.c
@@ -207,7 +207,6 @@ struct zs_pool {
207 struct size_class size_class[ZS_SIZE_CLASSES]; 207 struct size_class size_class[ZS_SIZE_CLASSES];
208 208
209 gfp_t flags; /* allocation flags used when growing pool */ 209 gfp_t flags; /* allocation flags used when growing pool */
210 const char *name;
211}; 210};
212 211
213/* 212/*
@@ -798,8 +797,7 @@ fail:
798 797
799/** 798/**
800 * zs_create_pool - Creates an allocation pool to work from. 799 * zs_create_pool - Creates an allocation pool to work from.
801 * @name: name of the pool to be created 800 * @flags: allocation flags used to allocate pool metadata
802 * @flags: allocation flags used when growing pool
803 * 801 *
804 * This function must be called before anything when using 802 * This function must be called before anything when using
805 * the zsmalloc allocator. 803 * the zsmalloc allocator.
@@ -807,14 +805,11 @@ fail:
807 * On success, a pointer to the newly created pool is returned, 805 * On success, a pointer to the newly created pool is returned,
808 * otherwise NULL. 806 * otherwise NULL.
809 */ 807 */
810struct zs_pool *zs_create_pool(const char *name, gfp_t flags) 808struct zs_pool *zs_create_pool(gfp_t flags)
811{ 809{
812 int i, ovhd_size; 810 int i, ovhd_size;
813 struct zs_pool *pool; 811 struct zs_pool *pool;
814 812
815 if (!name)
816 return NULL;
817
818 ovhd_size = roundup(sizeof(*pool), PAGE_SIZE); 813 ovhd_size = roundup(sizeof(*pool), PAGE_SIZE);
819 pool = kzalloc(ovhd_size, GFP_KERNEL); 814 pool = kzalloc(ovhd_size, GFP_KERNEL);
820 if (!pool) 815 if (!pool)
@@ -837,7 +832,6 @@ struct zs_pool *zs_create_pool(const char *name, gfp_t flags)
837 } 832 }
838 833
839 pool->flags = flags; 834 pool->flags = flags;
840 pool->name = name;
841 835
842 return pool; 836 return pool;
843} 837}
diff --git a/drivers/staging/zsmalloc/zsmalloc.h b/drivers/staging/zsmalloc/zsmalloc.h
index de2e8bfbcc06..46dbd0558d86 100644
--- a/drivers/staging/zsmalloc/zsmalloc.h
+++ b/drivers/staging/zsmalloc/zsmalloc.h
@@ -28,7 +28,7 @@ enum zs_mapmode {
28 28
29struct zs_pool; 29struct zs_pool;
30 30
31struct zs_pool *zs_create_pool(const char *name, gfp_t flags); 31struct zs_pool *zs_create_pool(gfp_t flags);
32void zs_destroy_pool(struct zs_pool *pool); 32void zs_destroy_pool(struct zs_pool *pool);
33 33
34unsigned long zs_malloc(struct zs_pool *pool, size_t size); 34unsigned long zs_malloc(struct zs_pool *pool, size_t size);