Commit 5eb8deb4 authored by Sergey Shtylyov's avatar Sergey Shtylyov Committed by Damien Le Moal
Browse files

ata: libata-core: get rid of *else* branches in ata_id_n_sectors() 



Using *else* after *return* doesn't make much sense -- getting rid of such
*else* branches reduces the indentation levels and thus reduces # of LoC...

Signed-off-by: default avatarSergey Shtylyov <s.shtylyov@omp.ru>
Signed-off-by: default avatarDamien Le Moal <damien.lemoal@opensource.wdc.com>
parent 79ad6a56

drivers/ata/libata-core.c

+9 −11
Original line number Diff line number Diff line
@@ -1103,19 +1103,17 @@ static u64 ata_id_n_sectors(const u16 *id) 
	if (ata_id_has_lba(id)) {

		if (ata_id_has_lba48(id))

			return ata_id_u64(id, ATA_ID_LBA_CAPACITY_2);

		else



		return ata_id_u32(id, ATA_ID_LBA_CAPACITY);

	} else {

	}



	if (ata_id_current_chs_valid(id))

			return (u32)id[ATA_ID_CUR_CYLS] *

			       (u32)id[ATA_ID_CUR_HEADS] *

		return (u32)id[ATA_ID_CUR_CYLS] * (u32)id[ATA_ID_CUR_HEADS] *

		       (u32)id[ATA_ID_CUR_SECTORS];

		else

			return (u32)id[ATA_ID_CYLS] *

			       (u32)id[ATA_ID_HEADS] *



	return (u32)id[ATA_ID_CYLS] * (u32)id[ATA_ID_HEADS] *

	       (u32)id[ATA_ID_SECTORS];

}

}



u64 ata_tf_to_lba48(const struct ata_taskfile *tf)

{