Commit fc11a550 authored by Benjamin Romer's avatar Benjamin Romer Committed by Greg Kroah-Hartman

staging: unisys: clean up NULL comparisons in visorchannel_funcs.c

Correct all comparisons with NULL so that NULL isn't needed.
Signed-off-by: default avatarBenjamin Romer <benjamin.romer@unisys.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 82fdb8dd
...@@ -58,7 +58,7 @@ visorchannel_create_guts(HOSTADDRESS physaddr, ulong channel_bytes, ...@@ -58,7 +58,7 @@ visorchannel_create_guts(HOSTADDRESS physaddr, ulong channel_bytes,
void *rc = NULL; void *rc = NULL;
p = kmalloc(sizeof(*p), GFP_KERNEL|__GFP_NORETRY); p = kmalloc(sizeof(*p), GFP_KERNEL|__GFP_NORETRY);
if (p == NULL) { if (!p) {
rc = NULL; rc = NULL;
goto cleanup; goto cleanup;
} }
...@@ -68,7 +68,7 @@ visorchannel_create_guts(HOSTADDRESS physaddr, ulong channel_bytes, ...@@ -68,7 +68,7 @@ visorchannel_create_guts(HOSTADDRESS physaddr, ulong channel_bytes,
spin_lock_init(&p->remove_lock); spin_lock_init(&p->remove_lock);
/* prepare chan_hdr (abstraction to read/write channel memory) */ /* prepare chan_hdr (abstraction to read/write channel memory) */
if (parent == NULL) if (!parent)
p->memregion = p->memregion =
visor_memregion_create(physaddr, visor_memregion_create(physaddr,
sizeof(struct channel_header)); sizeof(struct channel_header));
...@@ -76,7 +76,7 @@ visorchannel_create_guts(HOSTADDRESS physaddr, ulong channel_bytes, ...@@ -76,7 +76,7 @@ visorchannel_create_guts(HOSTADDRESS physaddr, ulong channel_bytes,
p->memregion = p->memregion =
visor_memregion_create_overlapped(parent->memregion, visor_memregion_create_overlapped(parent->memregion,
off, sizeof(struct channel_header)); off, sizeof(struct channel_header));
if (p->memregion == NULL) { if (!p->memregion) {
rc = NULL; rc = NULL;
goto cleanup; goto cleanup;
} }
...@@ -101,8 +101,8 @@ visorchannel_create_guts(HOSTADDRESS physaddr, ulong channel_bytes, ...@@ -101,8 +101,8 @@ visorchannel_create_guts(HOSTADDRESS physaddr, ulong channel_bytes,
rc = p; rc = p;
cleanup: cleanup:
if (rc == NULL) { if (!rc) {
if (p != NULL) { if (!p) {
visorchannel_destroy(p); visorchannel_destroy(p);
p = NULL; p = NULL;
} }
...@@ -150,9 +150,9 @@ EXPORT_SYMBOL_GPL(visorchannel_create_overlapped_with_lock); ...@@ -150,9 +150,9 @@ EXPORT_SYMBOL_GPL(visorchannel_create_overlapped_with_lock);
void void
visorchannel_destroy(struct visorchannel *channel) visorchannel_destroy(struct visorchannel *channel)
{ {
if (channel == NULL) if (!channel)
return; return;
if (channel->memregion != NULL) { if (channel->memregion) {
visor_memregion_destroy(channel->memregion); visor_memregion_destroy(channel->memregion);
channel->memregion = NULL; channel->memregion = NULL;
} }
...@@ -252,7 +252,7 @@ visorchannel_clear(struct visorchannel *channel, ulong offset, u8 ch, ...@@ -252,7 +252,7 @@ visorchannel_clear(struct visorchannel *channel, ulong offset, u8 ch,
int written = 0; int written = 0;
u8 *buf = vmalloc(bufsize); u8 *buf = vmalloc(bufsize);
if (buf == NULL) if (!buf)
goto cleanup; goto cleanup;
memset(buf, ch, bufsize); memset(buf, ch, bufsize);
...@@ -274,7 +274,7 @@ visorchannel_clear(struct visorchannel *channel, ulong offset, u8 ch, ...@@ -274,7 +274,7 @@ visorchannel_clear(struct visorchannel *channel, ulong offset, u8 ch,
rc = 0; rc = 0;
cleanup: cleanup:
if (buf != NULL) { if (buf) {
vfree(buf); vfree(buf);
buf = NULL; buf = NULL;
} }
...@@ -560,11 +560,10 @@ visorchannel_debug(struct visorchannel *channel, int num_queues, ...@@ -560,11 +560,10 @@ visorchannel_debug(struct visorchannel *channel, int num_queues,
int i = 0; int i = 0;
int errcode = 0; int errcode = 0;
if (channel == NULL) if (!channel)
return; return;
memregion = channel->memregion; memregion = channel->memregion;
if (memregion == NULL) if (!memregion)
return; return;
addr = visor_memregion_get_physaddr(memregion); addr = visor_memregion_get_physaddr(memregion);
......
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