From mboxrd@z Thu Jan 1 00:00:00 1970 From: Bartlomiej Zolnierkiewicz Subject: [PATCH 03/64] pata_ali: cleanup ali_set_piomode() Date: Mon, 18 Jan 2010 18:14:12 +0100 Message-ID: <20100118171412.14623.94854.sendpatchset@localhost> References: <20100118171349.14623.90030.sendpatchset@localhost> Return-path: In-Reply-To: <20100118171349.14623.90030.sendpatchset@localhost> Sender: linux-kernel-owner@vger.kernel.org To: linux-ide@vger.kernel.org Cc: Bartlomiej Zolnierkiewicz , linux-kernel@vger.kernel.org List-Id: linux-ide@vger.kernel.org From: Bartlomiej Zolnierkiewicz Subject: [PATCH] pata_ali: cleanup ali_set_piomode() Merge ali_fifo_control() calls. Signed-off-by: Bartlomiej Zolnierkiewicz --- drivers/ata/pata_ali.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) Index: b/drivers/ata/pata_ali.c =================================================================== --- a/drivers/ata/pata_ali.c +++ 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); } /**