Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit aab3b1a3 authored by Alexander Usyskin's avatar Alexander Usyskin Committed by Greg Kroah-Hartman
Browse files

mei: drop mei_io_cb_alloc_buf 



mei_io_cb_alloc_buf have a single caller :mei_cl_alloc_cb. After amthif
stopped using it, the code can be integrated into the caller and the
function can be dropped.

Signed-off-by: default avatarAlexander Usyskin <alexander.usyskin@intel.com>
Signed-off-by: default avatarTomas Winkler <tomas.winkler@intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 35eda92a

drivers/misc/mei/client.c

+6 −26
Original line number Diff line number Diff line
@@ -419,31 +419,6 @@ static inline void mei_io_list_free(struct mei_cl_cb *list, struct mei_cl *cl) 
	__mei_io_list_flush(list, cl, true);

}



/**

 * mei_io_cb_alloc_buf - allocate callback buffer

 *

 * @cb: io callback structure

 * @length: size of the buffer

 *

 * Return: 0 on success

 *         -EINVAL if cb is NULL

 *         -ENOMEM if allocation failed

 */

int mei_io_cb_alloc_buf(struct mei_cl_cb *cb, size_t length)

{

	if (!cb)

		return -EINVAL;



	if (length == 0)

		return 0;



	cb->buf.data = kmalloc(length, GFP_KERNEL);

	if (!cb->buf.data)

		return -ENOMEM;

	cb->buf.size = length;

	return 0;

}



/**

 * mei_cl_alloc_cb - a convenient wrapper for allocating read cb

 *
@@ -464,10 +439,15 @@ struct mei_cl_cb *mei_cl_alloc_cb(struct mei_cl *cl, size_t length, 
	if (!cb)

		return NULL;



	if (mei_io_cb_alloc_buf(cb, length)) {

	if (length == 0)

		return cb;



	cb->buf.data = kmalloc(length, GFP_KERNEL);

	if (!cb->buf.data) {

		mei_io_cb_free(cb);

		return NULL;

	}

	cb->buf.size = length;



	return cb;

}

drivers/misc/mei/client.h

+0 −2
Original line number Diff line number Diff line
@@ -85,8 +85,6 @@ static inline u8 mei_me_cl_ver(const struct mei_me_client *me_cl) 
struct mei_cl_cb *mei_io_cb_init(struct mei_cl *cl, enum mei_cb_file_ops type,

				 const struct file *fp);

void mei_io_cb_free(struct mei_cl_cb *priv_cb);

int mei_io_cb_alloc_buf(struct mei_cl_cb *cb, size_t length);





/**

 * mei_io_list_init - Sets up a queue list.