pata_ali: cleanup ali_set_piomode()

PATCH In review Bartlomiej Zolnierkiewicz 2 participants 2 messages Oct 13, 2011 libata

lore

Share & tools

lore

Bartlomiej Zolnierkiewicz

author

2011-10-13 11:09 UTC #0 lore raw

PATCH 1/1 pata_ali: cleanup ali_set_piomode()

From: Bartlomiej Zolnierkiewicz <[email protected]>
Subject: [PATCH] pata_ali: cleanup ali_set_piomode()

Merge ali_fifo_control() calls.

This changes behavior but there shouldn't be any problems with it.

Signed-off-by Bartlomiej Zolnierkiewicz <[email protected]>

---
earlier references:
https://lkml.org/lkml/2010/1/18/258

 drivers/ata/pata_ali.c |    7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

drivers/ata/pata_ali.c +2 -5

Index: b/drivers/ata/pata_ali.c
===================================================================
@@ -222,12 +222,9 @@ static void ali_set_piomode(struct ata_p
 	}
 
 	/* PIO FIFO is only permitted on ATA disk */
-	if (adev->class != ATA_DEV_ATA)
-		ali_fifo_control(ap, adev, 0x00);
-	ali_program_modes(ap, adev, &t, 0);
-	if (adev->class == ATA_DEV_ATA)
-		ali_fifo_control(ap, adev, 0x05);
+	ali_fifo_control(ap, adev, (adev->class == ATA_DEV_ATA) ? 0x05 : 0x00);
 
+	ali_program_modes(ap, adev, &t, 0);
 }
 
 /**

Alan Cox

2011-10-13 12:54 UTC #1 lore raw

Quoted 8 lines · On Thu, 13 Oct 2011 13:09:25 +0200 Bartlomiej Zolnierkiewicz…

From: Bartlomiej Zolnierkiewicz <[email protected]>
Subject: [PATCH] pata_ali: cleanup ali_set_piomode()
Merge ali_fifo_control() calls.
This changes behavior but there shouldn't be any problems with it.
Signed-off-by Bartlomiej Zolnierkiewicz <[email protected]>

It's not really much of a 'clean' and the old behaviour matches the documentation.