Commit 51646f4d authored by David Kershner's avatar David Kershner Committed by Greg Kroah-Hartman
Browse files

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: default avatarDavid Kershner <david.kershner@unisys.com>
Reviewed-by: default avatarReviewed-by: Tim Sell <timothy.sell@unisys.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 493d1597

drivers/staging/unisys/visorbus/visorchannel.c

+6 −12
Original line number Diff line number Diff line
@@ -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 */

	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 */

	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);

CRA Git | Maintained and supported by SUSTech CRA and CCSE