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

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

[Sergey Shtylyov]

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: Sergey Shtylyov <s.shtylyov@omp.ru>

---
This patch is against the 'for-next' branch of Damien's 'libata.git' repo.

 drivers/ata/libata-core.c |   20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

Index: libata/drivers/ata/libata-core.c
===================================================================
--- libata.orig/drivers/ata/libata-core.c
+++ libata/drivers/ata/libata-core.c
@@ -1103,18 +1103,16 @@ static u64 ata_id_n_sectors(const u16 *i
 	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] *
-			       (u32)id[ATA_ID_CUR_SECTORS];
-		else
-			return (u32)id[ATA_ID_CYLS] *
-			       (u32)id[ATA_ID_HEADS] *
-			       (u32)id[ATA_ID_SECTORS];
+
+		return ata_id_u32(id, ATA_ID_LBA_CAPACITY);
 	}
+
+	if (ata_id_current_chs_valid(id))
+		return (u32)id[ATA_ID_CUR_CYLS] * (u32)id[ATA_ID_CUR_HEADS] *
+		       (u32)id[ATA_ID_CUR_SECTORS];
+
+	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)

Re: [PATCH] ata: libata-core: get rid of *else* branches in ata_id_n_sectors()

[Sergey Shtylyov]

On 6/10/22 12:06 AM, Sergey Shtylyov wrote:

> 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: Sergey Shtylyov <s.shtylyov@omp.ru>

Suggested-by: Damien Le Moal <damien.lemoal@opensource.wdc.com>

MBR, Sergey

Re: [PATCH] ata: libata-core: get rid of *else* branches in ata_id_n_sectors()

[Damien Le Moal]

On 6/10/22 06:06, Sergey Shtylyov wrote:
> 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: Sergey Shtylyov <s.shtylyov@omp.ru>

Applied to for-5.20. Thanks !


-- 
Damien Le Moal
Western Digital Research