From patchwork Fri Jan 29 16:06:03 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bartlomiej Zolnierkiewicz X-Patchwork-Id: 43986 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 2614CB7D2A for ; Sat, 30 Jan 2010 03:18:44 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752993Ab0A2QSA (ORCPT ); Fri, 29 Jan 2010 11:18:00 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754689Ab0A2QRt (ORCPT ); Fri, 29 Jan 2010 11:17:49 -0500 Received: from mail-fx0-f220.google.com ([209.85.220.220]:53041 "EHLO mail-fx0-f220.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754221Ab0A2QGL (ORCPT ); Fri, 29 Jan 2010 11:06:11 -0500 Received: by mail-fx0-f220.google.com with SMTP id 20so2015120fxm.21 for ; Fri, 29 Jan 2010 08:06:10 -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=91xLP58UaU/o6F4xtKGGi71pbVFwM0dM7JacVBM1buA=; b=kkSI/zJ+I1300yi0jXjhUA9QJIleyLbLlFTiHKMYRKFtNXIDxNxGCiegGhnmDa/feo 3ULEFQ0ljneJK9MYONIjMhDfjN9ffT9C7zi2W9AFooqq+NSE/nSw23lbBm++xA5YK3o1 O1g4qKdAWbp37fuVmssBswuYy7//O6eznwpUE= 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=qZQzOpVPWo2INsqymeX1Y4059N8OZX45Z45LTPcyp5nn5pPOeUxrJkYNSeaO1qBpIE S741XtTYLUj20ue6toS4FXjEiBZkdjavQvfNWmlutCWbE7zEIkSOCEqICVdjNIFCmKX5 HK+87p6+6IMuQgYiOmwa2CYQg7TmEqqJGWCsU= Received: by 10.223.77.141 with SMTP id g13mr790012fak.95.1264781170146; Fri, 29 Jan 2010 08:06:10 -0800 (PST) Received: from ?127.0.0.1? (chello089079027028.chello.pl [89.79.27.28]) by mx.google.com with ESMTPS id 13sm549882fxm.9.2010.01.29.08.06.09 (version=TLSv1/SSLv3 cipher=RC4-MD5); Fri, 29 Jan 2010 08:06:09 -0800 (PST) From: Bartlomiej Zolnierkiewicz To: linux-ide@vger.kernel.org Cc: Bartlomiej Zolnierkiewicz , linux-kernel@vger.kernel.org Date: Fri, 29 Jan 2010 17:06:03 +0100 Message-Id: <20100129160603.21495.85374.sendpatchset@localhost> In-Reply-To: <20100129160308.21495.14120.sendpatchset@localhost> References: <20100129160308.21495.14120.sendpatchset@localhost> Subject: [PATCH 27/68] slc90e66: always program control bits Sender: linux-ide-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-ide@vger.kernel.org From: Bartlomiej Zolnierkiewicz Subject: [PATCH] slc90e66: always program control bits This matches behavior of libata pata_efar host driver. Signed-off-by: Bartlomiej Zolnierkiewicz --- drivers/ide/slc90e66.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 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/ide/slc90e66.c =================================================================== --- a/drivers/ide/slc90e66.c +++ b/drivers/ide/slc90e66.c @@ -50,20 +50,16 @@ static void slc90e66_set_pio_mode(ide_hw if (is_slave) { master_data |= 0x4000; master_data &= ~0x0070; - if (pio > 1) { - /* Set PPE, IE and TIME */ - master_data |= control << 4; - } + /* Set PPE, IE and TIME */ + master_data |= control << 4; pci_read_config_byte(dev, slave_port, &slave_data); slave_data &= hwif->channel ? 0x0f : 0xf0; slave_data |= ((timings[pio][0] << 2) | timings[pio][1]) << (hwif->channel ? 4 : 0); } else { master_data &= ~0x3307; - if (pio > 1) { - /* enable PPE, IE and TIME */ - master_data |= control; - } + /* enable PPE, IE and TIME */ + master_data |= control; master_data |= (timings[pio][0] << 12) | (timings[pio][1] << 8); } pci_write_config_word(dev, master_port, master_data);