From: Alex Elder Date: Mon, 6 Oct 2014 11:53:12 +0000 (-0500) Subject: greybus: kill __alloc_gbuf() X-Git-Tag: v4.9-rc1~119^2~378^2~21^2~2031 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=fdb594f1366327f10cbc8167a9923a5e88a381fa;p=karo-tx-linux.git greybus: kill __alloc_gbuf() GEt rid of __alloc_gbuf(), now that it's used in only one place. Signed-off-by: Alex Elder Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/greybus/gbuf.c b/drivers/staging/greybus/gbuf.c index 62d0cb63a83e..2ef6ead8ed17 100644 --- a/drivers/staging/greybus/gbuf.c +++ b/drivers/staging/greybus/gbuf.c @@ -26,28 +26,6 @@ static struct kmem_cache *gbuf_head_cache; /* Workqueue to handle Greybus buffer completions. */ static struct workqueue_struct *gbuf_workqueue; -static struct gbuf *__alloc_gbuf(struct gb_connection *connection, - bool outbound, - gbuf_complete_t complete, - gfp_t gfp_mask, - void *context) -{ - struct gbuf *gbuf; - - gbuf = kmem_cache_zalloc(gbuf_head_cache, gfp_mask); - if (!gbuf) - return NULL; - - kref_init(&gbuf->kref); - gbuf->connection = connection; - INIT_WORK(&gbuf->event, cport_process_event); - gbuf->outbound = outbound; - gbuf->complete = complete; - gbuf->context = context; - - return gbuf; -} - /** * greybus_alloc_gbuf - allocate a greybus buffer * @@ -73,14 +51,21 @@ struct gbuf *greybus_alloc_gbuf(struct gb_connection *connection, struct gbuf *gbuf; int retval; - gbuf = __alloc_gbuf(connection, outbound, complete, gfp_mask, context); + gbuf = kmem_cache_zalloc(gbuf_head_cache, gfp_mask); if (!gbuf) return NULL; + kref_init(&gbuf->kref); + gbuf->connection = connection; + INIT_WORK(&gbuf->event, cport_process_event); + gbuf->outbound = outbound; + gbuf->complete = complete; + gbuf->context = context; + /* Host controller specific allocation for the actual buffer */ retval = connection->hd->driver->alloc_gbuf_data(gbuf, size, gfp_mask); if (retval) { - greybus_free_gbuf(gbuf); + kmem_cache_free(gbuf_head_cache, gbuf); return NULL; }