Commit 6a5945a8 authored by Andy Shevchenko's avatar Andy Shevchenko Committed by Jens Axboe
Browse files

pktcdvd: Get rid of redundant 'else' 



In the snippets like the following

	if (...)
		return / goto / break / continue ...;
	else
		...

the 'else' is redundant. Get rid of it.

Signed-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Reviewed-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Link: https://lore.kernel.org/r/20230310164549.22133-9-andriy.shevchenko@linux.intel.com


Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 046636a4

drivers/block/pktcdvd.c

+7 −7
Original line number Diff line number Diff line
@@ -941,26 +941,26 @@ static int pkt_set_segment_merging(struct pktcdvd_device *pd, struct request_que 
{

	struct device *ddev = disk_to_dev(pd->disk);



	if ((pd->settings.size << 9) / CD_FRAMESIZE

	    <= queue_max_segments(q)) {

	if ((pd->settings.size << 9) / CD_FRAMESIZE <= queue_max_segments(q)) {

		/*

		 * The cdrom device can handle one segment/frame

		 */

		clear_bit(PACKET_MERGE_SEGS, &pd->flags);

		return 0;

	} else if ((pd->settings.size << 9) / PAGE_SIZE

		   <= queue_max_segments(q)) {

	}



	if ((pd->settings.size << 9) / PAGE_SIZE <= queue_max_segments(q)) {

		/*

		 * We can handle this case at the expense of some extra memory

		 * copies during write operations

		 */

		set_bit(PACKET_MERGE_SEGS, &pd->flags);

		return 0;

	} else {

	}



	dev_err(ddev, "cdrom max_phys_segments too small\n");

	return -EIO;

}

}



static void pkt_end_io_read(struct bio *bio)

{