Skip to contentSkip to conversation

staging: unisys: replace kzalloc/kfree with UISMALLOC/UISFREE

PATCH New Daeseok Youn 1 participant 1 message Mar 19, 2014 Staging

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 staging: unisys: replace kzalloc/kfree with UISMALLOC/UISFREE

It doesn't need to trace status of buffer when buffers are allocated/deallocated. So stuff of tracing memory status are removed. And also UISMALLOC/UISFREE macro are removed completetly. just use kzalloc/kfree.

---
v2: removed __GFP_NORETRY flag for kzalloc()

 drivers/staging/unisys/include/uisutils.h |    6 --
 drivers/staging/unisys/uislib/uislib.c    |  107 +++--------------------------
 drivers/staging/unisys/uislib/uisutils.c  |    5 +-
 3 files changed, 13 insertions(+), 105 deletions(-)
drivers/staging/unisys/include/uisutils.h +0 -6
index 81b5d9b..1c6d872 100644
@@ -340,12 +340,6 @@ static inline unsigned int Issue_VMCALL_FATAL_BYE_BYE(void)
 }
 
 #define UIS_DAEMONIZE(nam)
-void *uislib_malloc(size_t siz, gfp_t gfp, U8 contiguous, char *fn, int ln);
-#define UISMALLOC(siz, gfp) uislib_malloc(siz, gfp, 1, __FILE__, __LINE__)
-#define UISVMALLOC(siz) uislib_malloc(siz, 0, 0, __FILE__, __LINE__)
-void uislib_free(void *p, size_t siz, U8 contiguous, char *fn, int ln);
-#define UISFREE(p, siz) uislib_free(p, siz, 1, __FILE__, __LINE__)
-#define UISVFREE(p, siz) uislib_free(p, siz, 0, __FILE__, __LINE__)
 void *uislib_cache_alloc(struct kmem_cache *cur_pool, char *fn, int ln);
 #define UISCACHEALLOC(cur_pool) uislib_cache_alloc(cur_pool, __FILE__, __LINE__)
 void uislib_cache_free(struct kmem_cache *cur_pool, void *p, char *fn, int ln);
drivers/staging/unisys/uislib/uislib.c +11 -96

191 lines not on this page · raw message

drivers/staging/unisys/uislib/uisutils.c +2 -3
index 208b7ea..3178f75 100644
@@ -291,10 +291,9 @@ ReqHandlerAdd(GUID switchTypeGuid,
 {
 	ReqHandlerInfo_t *rc = NULL;
 
-	rc = UISMALLOC(sizeof(*rc), GFP_ATOMIC);
+	rc = kzalloc(sizeof(*rc), GFP_ATOMIC);
 	if (!rc)
 		return NULL;
-	memset(rc, 0, sizeof(*rc));
 	rc->switchTypeGuid = switchTypeGuid;
 	rc->controlfunc = controlfunc;
 	rc->min_channel_bytes = min_channel_bytes;
@@ -342,7 +341,7 @@ ReqHandlerDel(GUID switchTypeGuid)
 		    (&entry->switchTypeGuid, &switchTypeGuid,
 		     sizeof(GUID)) == 0) {
 			list_del(lelt);
-			UISFREE(entry, sizeof(*entry));
+			kfree(entry);
 			rc++;
 		}
 	}
Signature · 1 line
1.7.4.4