From d2158f69a7d469c21c37f7028c18aa8c54707de3 Mon Sep 17 00:00:00 2001 From: Richard Weinberger Date: Mon, 6 Oct 2014 15:58:07 +0200 Subject: [PATCH] UBI: Remove alloc_ai() slab name from parameter list There is always exactly one ubi_attach_info object allocated, therefore we don't have to care about the name. Signed-off-by: Richard Weinberger --- drivers/mtd/ubi/attach.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/mtd/ubi/attach.c b/drivers/mtd/ubi/attach.c index ef619c3a75d3..5d89b3fb1d3c 100644 --- a/drivers/mtd/ubi/attach.c +++ b/drivers/mtd/ubi/attach.c @@ -1301,7 +1301,7 @@ out_ech: return err; } -static struct ubi_attach_info *alloc_ai(const char *slab_name) +static struct ubi_attach_info *alloc_ai(void) { struct ubi_attach_info *ai; @@ -1314,7 +1314,7 @@ static struct ubi_attach_info *alloc_ai(const char *slab_name) INIT_LIST_HEAD(&ai->erase); INIT_LIST_HEAD(&ai->alien); ai->volumes = RB_ROOT; - ai->aeb_slab_cache = kmem_cache_create(slab_name, + ai->aeb_slab_cache = kmem_cache_create("ubi_aeb_slab_cache", sizeof(struct ubi_ainf_peb), 0, 0, NULL); if (!ai->aeb_slab_cache) { @@ -1375,7 +1375,7 @@ static int scan_fast(struct ubi_device *ubi, struct ubi_attach_info **ai) return UBI_NO_FASTMAP; destroy_ai(*ai); - *ai = alloc_ai("ubi_aeb_slab_cache"); + *ai = alloc_ai(); if (!*ai) return -ENOMEM; @@ -1404,7 +1404,7 @@ int ubi_attach(struct ubi_device *ubi, int force_scan) int err; struct ubi_attach_info *ai; - ai = alloc_ai("ubi_aeb_slab_cache"); + ai = alloc_ai(); if (!ai) return -ENOMEM; @@ -1422,7 +1422,7 @@ int ubi_attach(struct ubi_device *ubi, int force_scan) if (err > 0) { if (err != UBI_NO_FASTMAP) { destroy_ai(ai); - ai = alloc_ai("ubi_aeb_slab_cache2"); + ai = alloc_ai(); if (!ai) return -ENOMEM; @@ -1461,7 +1461,7 @@ int ubi_attach(struct ubi_device *ubi, int force_scan) if (ubi->fm && ubi_dbg_chk_gen(ubi)) { struct ubi_attach_info *scan_ai; - scan_ai = alloc_ai("ubi_ckh_aeb_slab_cache"); + scan_ai = alloc_ai(); if (!scan_ai) { err = -ENOMEM; goto out_wl; -- 2.39.5