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

Commit f6281af9 authored by Geliang Tang's avatar Geliang Tang Committed by Greg Kroah-Hartman
Browse files

usb: gadget: rndis: use list_for_each_entry_safe 



Use list_for_each_entry_safe() instead of list_for_each_safe() to
simplify the code.

Signed-off-by: default avatarGeliang Tang <geliangtang@163.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 32540ba2

drivers/usb/gadget/function/rndis.c

+6 −12
Original line number Diff line number Diff line
@@ -914,7 +914,7 @@ struct rndis_params *rndis_register(void (*resp_avail)(void *v), void *v) 
	params->media_state = RNDIS_MEDIA_STATE_DISCONNECTED;

	params->resp_avail = resp_avail;

	params->v = v;

	INIT_LIST_HEAD(&(params->resp_queue));

	INIT_LIST_HEAD(&params->resp_queue);

	pr_debug("%s: configNr = %d\n", __func__, i);



	return params;
@@ -1006,12 +1006,9 @@ EXPORT_SYMBOL_GPL(rndis_add_hdr); 


void rndis_free_response(struct rndis_params *params, u8 *buf)

{

	rndis_resp_t *r;

	struct list_head *act, *tmp;

	rndis_resp_t *r, *n;



	list_for_each_safe(act, tmp, &(params->resp_queue))

	{

		r = list_entry(act, rndis_resp_t, list);

	list_for_each_entry_safe(r, n, &params->resp_queue, list) {

		if (r && r->buf == buf) {

			list_del(&r->list);

			kfree(r);
@@ -1022,14 +1019,11 @@ EXPORT_SYMBOL_GPL(rndis_free_response); 


u8 *rndis_get_next_response(struct rndis_params *params, u32 *length)

{

	rndis_resp_t *r;

	struct list_head *act, *tmp;

	rndis_resp_t *r, *n;



	if (!length) return NULL;



	list_for_each_safe(act, tmp, &(params->resp_queue))

	{

		r = list_entry(act, rndis_resp_t, list);

	list_for_each_entry_safe(r, n, &params->resp_queue, list) {

		if (!r->send) {

			r->send = 1;

			*length = r->length;
@@ -1053,7 +1047,7 @@ static rndis_resp_t *rndis_add_response(struct rndis_params *params, u32 length) 
	r->length = length;

	r->send = 0;



	list_add_tail(&r->list, &(params->resp_queue));

	list_add_tail(&r->list, &params->resp_queue);

	return r;

}