summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTomas Winkler <tomas.winkler@intel.com>2011-12-04 16:16:27 +0200
committerGreg Kroah-Hartman <gregkh@suse.de>2011-12-08 15:00:44 -0800
commit3a5352fc9d316fe1be18daf80571e80805e06f11 (patch)
tree4023316df7c0c410748c9a27cf3b50e49738858e
parent91762057f439bb0adb33ca857b6022fda4b1fd69 (diff)
downloadop-kernel-dev-3a5352fc9d316fe1be18daf80571e80805e06f11.zip
op-kernel-dev-3a5352fc9d316fe1be18daf80571e80805e06f11.tar.gz
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 <oren.jer.weil@intel.com> Reported-by: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: Tomas Winkler <tomas.winkler@intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r--drivers/staging/mei/init.c13
1 files changed, 5 insertions, 8 deletions
diff --git a/drivers/staging/mei/init.c b/drivers/staging/mei/init.c
index 32cf05e..ce10224 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);
}
}
OpenPOWER on IntegriCloud