From patchwork Mon Jan 18 17:14:12 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bartlomiej Zolnierkiewicz X-Patchwork-Id: 43086 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id DCBA7B7C94 for ; Tue, 19 Jan 2010 04:15:55 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753835Ab0ARRPd (ORCPT ); Mon, 18 Jan 2010 12:15:33 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753603Ab0ARRPb (ORCPT ); Mon, 18 Jan 2010 12:15:31 -0500 Received: from mail-ew0-f214.google.com ([209.85.219.214]:53275 "EHLO mail-ew0-f214.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753835Ab0ARRP1 (ORCPT ); Mon, 18 Jan 2010 12:15:27 -0500 Received: by mail-ew0-f214.google.com with SMTP id 6so3704487ewy.29 for ; Mon, 18 Jan 2010 09:15:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:from:to:cc:date:message-id :in-reply-to:references:subject; bh=a/gilPWsQz5gHMPVPtMqkOdgFZLm7UuckhARbB33X1w=; b=kiQFiiu+Zy19kBUOdvL49qeF6ocCdsXkFDVpYcUK6f3Fgo54t7sBR5I+TIgnVkHI3d kNXIunWDDE66LcjWMRnaX3FoqGKMcKIrapz8m+ekoScyBFr2KJ8LbbC3/0FHlGNvqje9 eWVI/1EAK0/OOT+f8Rag9UsdSlTsBa02iRLUg= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:date:message-id:in-reply-to:references:subject; b=IGQFc0B+JP7ieu8tfpvSrN7u8O2BpOpuk0Fl5OpGpqNGrVCDgSq9IBgKPJPwdmTTsJ 6wPJT6jxwWEmvAUcDXd2jyE7viUFcwKY8aCk6+IV4cdt1u2a3dY3wvyOhilY/WI5/qCK vbUniVtRN+BVcz8dp+wsGvQKUpX+4zJz2IMyc= Received: by 10.216.90.7 with SMTP id d7mr506401wef.81.1263834922090; Mon, 18 Jan 2010 09:15:22 -0800 (PST) Received: from ?127.0.0.1? (chello089079027028.chello.pl [89.79.27.28]) by mx.google.com with ESMTPS id g9sm5011049gvc.25.2010.01.18.09.15.20 (version=TLSv1/SSLv3 cipher=RC4-MD5); Mon, 18 Jan 2010 09:15:21 -0800 (PST) From: Bartlomiej Zolnierkiewicz To: linux-ide@vger.kernel.org Cc: Bartlomiej Zolnierkiewicz , linux-kernel@vger.kernel.org Date: Mon, 18 Jan 2010 18:14:12 +0100 Message-Id: <20100118171412.14623.94854.sendpatchset@localhost> In-Reply-To: <20100118171349.14623.90030.sendpatchset@localhost> References: <20100118171349.14623.90030.sendpatchset@localhost> Subject: [PATCH 03/64] pata_ali: cleanup ali_set_piomode() Sender: linux-ide-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: 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(-) -- To unsubscribe from this list: send the line "unsubscribe linux-ide" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html 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); } /**