Skip to content

Commit

Permalink
pktcdvd: Get rid of redundant 'else'
Browse files Browse the repository at this point in the history
In the snippets like the following

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

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

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Reviewed-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Link: https://lore.kernel.org/r/20230310164549.22133-9-andriy.shevchenko@linux.intel.com
Signed-off-by: Jens Axboe <axboe@kernel.dk>
  • Loading branch information
andy-shev authored and axboe committed Jun 7, 2023
1 parent 046636a commit 6a5945a
Showing 1 changed file with 7 additions and 7 deletions.
14 changes: 7 additions & 7 deletions drivers/block/pktcdvd.c
Original file line number Diff line number Diff line change
Expand Up @@ -941,25 +941,25 @@ 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;
}

dev_err(ddev, "cdrom max_phys_segments too small\n");
return -EIO;
}

static void pkt_end_io_read(struct bio *bio)
Expand Down

0 comments on commit 6a5945a

Please sign in to comment.