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

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
...@@ -914,7 +914,7 @@ struct rndis_params *rndis_register(void (*resp_avail)(void *v), void *v) ...@@ -914,7 +914,7 @@ struct rndis_params *rndis_register(void (*resp_avail)(void *v), void *v)
params->media_state = RNDIS_MEDIA_STATE_DISCONNECTED; params->media_state = RNDIS_MEDIA_STATE_DISCONNECTED;
params->resp_avail = resp_avail; params->resp_avail = resp_avail;
params->v = v; params->v = v;
INIT_LIST_HEAD(&(params->resp_queue)); INIT_LIST_HEAD(&params->resp_queue);
pr_debug("%s: configNr = %d\n", __func__, i); pr_debug("%s: configNr = %d\n", __func__, i);
return params; return params;
...@@ -1006,12 +1006,9 @@ EXPORT_SYMBOL_GPL(rndis_add_hdr); ...@@ -1006,12 +1006,9 @@ EXPORT_SYMBOL_GPL(rndis_add_hdr);
void rndis_free_response(struct rndis_params *params, u8 *buf) void rndis_free_response(struct rndis_params *params, u8 *buf)
{ {
rndis_resp_t *r; rndis_resp_t *r, *n;
struct list_head *act, *tmp;
list_for_each_safe(act, tmp, &(params->resp_queue)) list_for_each_entry_safe(r, n, &params->resp_queue, list) {
{
r = list_entry(act, rndis_resp_t, list);
if (r && r->buf == buf) { if (r && r->buf == buf) {
list_del(&r->list); list_del(&r->list);
kfree(r); kfree(r);
...@@ -1022,14 +1019,11 @@ EXPORT_SYMBOL_GPL(rndis_free_response); ...@@ -1022,14 +1019,11 @@ EXPORT_SYMBOL_GPL(rndis_free_response);
u8 *rndis_get_next_response(struct rndis_params *params, u32 *length) u8 *rndis_get_next_response(struct rndis_params *params, u32 *length)
{ {
rndis_resp_t *r; rndis_resp_t *r, *n;
struct list_head *act, *tmp;
if (!length) return NULL; if (!length) return NULL;
list_for_each_safe(act, tmp, &(params->resp_queue)) list_for_each_entry_safe(r, n, &params->resp_queue, list) {
{
r = list_entry(act, rndis_resp_t, list);
if (!r->send) { if (!r->send) {
r->send = 1; r->send = 1;
*length = r->length; *length = r->length;
...@@ -1053,7 +1047,7 @@ static rndis_resp_t *rndis_add_response(struct rndis_params *params, u32 length) ...@@ -1053,7 +1047,7 @@ static rndis_resp_t *rndis_add_response(struct rndis_params *params, u32 length)
r->length = length; r->length = length;
r->send = 0; r->send = 0;
list_add_tail(&r->list, &(params->resp_queue)); list_add_tail(&r->list, &params->resp_queue);
return r; return r;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment