diff options
| author | David Kershner <david.kershner@unisys.com> | 2017-03-28 09:34:56 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-03-29 09:17:03 +0200 |
| commit | 51646f4d4b8d5911b33340f44c641a3380dfc359 (patch) | |
| tree | 6916d9d0d2b8c4fc8adc7997256dc2b7c5ca6737 /drivers/staging/unisys | |
| parent | 493d1597dd7029a1a5325748a262bb98696eb97d (diff) | |
staging: unisys: visorbus: consolidate if statements
We had several if statements inside of if statements that should be
consolidated into an if statement with an && to clean up the code some
more.
Signed-off-by: David Kershner <david.kershner@unisys.com>
Reviewed-by: Reviewed-by: Tim Sell <timothy.sell@unisys.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/unisys')
| -rw-r--r-- | drivers/staging/unisys/visorbus/visorchannel.c | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/drivers/staging/unisys/visorbus/visorchannel.c b/drivers/staging/unisys/visorbus/visorchannel.c index 686137a59c5c..8c27b56a7aa7 100644 --- a/drivers/staging/unisys/visorbus/visorchannel.c +++ b/drivers/staging/unisys/visorbus/visorchannel.c @@ -418,12 +418,9 @@ visorchannel_create_guts(u64 physaddr, unsigned long channel_bytes, * release later on. */ channel->requested = request_mem_region(physaddr, size, MYDRVNAME); - if (!channel->requested) { - if (uuid_le_cmp(guid, spar_video_guid)) { - /* Not the video channel we care about this */ - goto err_destroy_channel; - } - } + if (!channel->requested && uuid_le_cmp(guid, spar_video_guid)) + /* we only care about errors if this is not the video channel */ + goto err_destroy_channel; channel->mapped = memremap(physaddr, size, MEMREMAP_WB); if (!channel->mapped) { @@ -451,12 +448,9 @@ visorchannel_create_guts(u64 physaddr, unsigned long channel_bytes, channel->mapped = NULL; channel->requested = request_mem_region(channel->physaddr, channel_bytes, MYDRVNAME); - if (!channel->requested) { - if (uuid_le_cmp(guid, spar_video_guid)) { - /* Different we care about this */ - goto err_destroy_channel; - } - } + if (!channel->requested && uuid_le_cmp(guid, spar_video_guid)) + /* we only care about errors if this is not the video channel */ + goto err_destroy_channel; channel->mapped = memremap(channel->physaddr, channel_bytes, MEMREMAP_WB); |