Skip to content

Commit

Permalink
usb: gadget: rndis: use list_for_each_entry_safe
Browse files Browse the repository at this point in the history
Use list_for_each_entry_safe() instead of list_for_each_safe() to
simplify the code.

Signed-off-by: Geliang Tang <geliangtang@163.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
Geliang Tang authored and Greg Kroah-Hartman committed Jan 25, 2016
1 parent 32540ba commit f6281af
Showing 1 changed file with 6 additions and 12 deletions.
18 changes: 6 additions & 12 deletions drivers/usb/gadget/function/rndis.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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);
Expand All @@ -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;
Expand All @@ -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;
}

Expand Down

0 comments on commit f6281af

Please sign in to comment.