From 3a5352fc9d316fe1be18daf80571e80805e06f11 Mon Sep 17 00:00:00 2001 From: Tomas Winkler Date: Sun, 4 Dec 2011 16:16:27 +0200 Subject: [PATCH] staging/mei: Don't check if loop cursor is null list_for_each_entry_safe(pos, next, &head, list) if (pos) { .... } This check isn't needed. The list cursor in a list_for_each() loop is always a valid pointer Cc: Oren Weil Reported-by: Dan Carpenter Signed-off-by: Tomas Winkler Signed-off-by: Greg Kroah-Hartman --- drivers/staging/mei/init.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/drivers/staging/mei/init.c b/drivers/staging/mei/init.c index 32cf05ee5fec..ce102248e3bb 100644 --- a/drivers/staging/mei/init.c +++ b/drivers/staging/mei/init.c @@ -48,11 +48,11 @@ void mei_io_list_init(struct mei_io_list *list) */ void mei_io_list_flush(struct mei_io_list *list, struct mei_cl *cl) { - struct mei_cl_cb *pos = NULL; - struct mei_cl_cb *next = NULL; + struct mei_cl_cb *pos; + struct mei_cl_cb *next; list_for_each_entry_safe(pos, next, &list->mei_cb.cb_list, cb_list) { - if (pos) { + if (pos->file_private) { struct mei_cl *cl_tmp; cl_tmp = (struct mei_cl *)pos->file_private; if (mei_cl_cmp_id(cl, cl_tmp)) @@ -332,11 +332,8 @@ void mei_reset(struct mei_device *dev, int interrupts_enabled) /* remove all waiting requests */ list_for_each_entry_safe(cb_pos, cb_next, &dev->write_list.mei_cb.cb_list, cb_list) { - if (cb_pos) { - list_del(&cb_pos->cb_list); - mei_free_cb_private(cb_pos); - cb_pos = NULL; - } + list_del(&cb_pos->cb_list); + mei_free_cb_private(cb_pos); } } -- 2.39.5