From patchwork Sat Jun 22 21:39:39 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergei Shtylyov X-Patchwork-Id: 253446 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 B889C2C041F for ; Sun, 23 Jun 2013 07:39:33 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751230Ab3FVVjc (ORCPT ); Sat, 22 Jun 2013 17:39:32 -0400 Received: from mail-la0-f44.google.com ([209.85.215.44]:49827 "EHLO mail-la0-f44.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751097Ab3FVVjc (ORCPT ); Sat, 22 Jun 2013 17:39:32 -0400 Received: by mail-la0-f44.google.com with SMTP id er20so8955253lab.31 for ; Sat, 22 Jun 2013 14:39:30 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=to:subject:from:organization:date:mime-version:content-type :content-transfer-encoding:message-id:x-gm-message-state; bh=ipMjEe7gQn3ncxk2gBA+dOjvztGea1XA4k1iyx0Muc4=; b=TBxgVaDWsCckeMIY8mYvqflwLioIOlWr4XOWvxkv1IiT4dQZdgCEN4hitq3lVSDC2H 9FfxZVtmFae9q3IEM0mVXTTkDUGxF/OHF/czZycfBUfXRXHto2S0IBtynQX/I1+DceqN 4lckpjO0+TR9BDEHNLCDumZRnvV/oYUn9IS5xawdp8xqu8u1hkUPoSMVkoTkLoRplEVA xu9GwXQ0q/jkbPnj0r9FJW0gbGePjwuhXxQAHE5qMd+2RUP9KmtCPHsAJc2A8zwz1I1D 8QUmfNSDuAGBBXe3VlgfGGU6q9PyC5J56skJj46QQwnsWN+4rsa+pUBG69TFLGW5eO9H LjfQ== X-Received: by 10.152.3.74 with SMTP id a10mr8503352laa.74.1371937170082; Sat, 22 Jun 2013 14:39:30 -0700 (PDT) Received: from wasted.dev.rtsoft.ru (mail.dev.rtsoft.ru. [213.79.90.226]) by mx.google.com with ESMTPSA id x8sm3942313lae.10.2013.06.22.14.39.28 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Sat, 22 Jun 2013 14:39:29 -0700 (PDT) To: linux-ide@vger.kernel.org, tj@kernel.org Subject: [PATCH v2] AHCI: use ATA_BUSY From: Sergei Shtylyov Organization: Cogent Embedded Date: Sun, 23 Jun 2013 01:39:39 +0400 MIME-Version: 1.0 Message-Id: <201306230139.39597.sergei.shtylyov@cogentembedded.com> X-Gm-Message-State: ALoCoQkQ+GMlaiAI2mHBkaxxfpeu8F/gEBxW12/ckjUNotmVeDxuKXh+Yy/4I/lWt7LeEKsziDML Sender: linux-ide-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-ide@vger.kernel.org ahci_hardreset() and ahci_p5wdh_hardreset() use bare numbers for the BSY bit of the ATA status register, despite it's #define'd in . Signed-off-by: Sergei Shtylyov --- The patch is against the 'for-3.11' branch of Tejun Heo's 'libata.git' repo. drivers/ata/ahci.c | 2 +- drivers/ata/libahci.c | 2 +- 2 files changed, 2 insertions(+), 2 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: libata/drivers/ata/ahci.c =================================================================== --- libata.orig/drivers/ata/ahci.c +++ libata/drivers/ata/ahci.c @@ -583,7 +583,7 @@ static int ahci_p5wdh_hardreset(struct a /* clear D2H reception area to properly wait for D2H FIS */ ata_tf_init(link->device, &tf); - tf.command = 0x80; + tf.command = ATA_BUSY; ata_tf_to_fis(&tf, 0, 0, d2h_fis); rc = sata_link_hardreset(link, sata_ehc_deb_timing(&link->eh_context), Index: libata/drivers/ata/libahci.c =================================================================== --- libata.orig/drivers/ata/libahci.c +++ libata/drivers/ata/libahci.c @@ -1413,7 +1413,7 @@ static int ahci_hardreset(struct ata_lin /* clear D2H reception area to properly wait for D2H FIS */ ata_tf_init(link->device, &tf); - tf.command = 0x80; + tf.command = ATA_BUSY; ata_tf_to_fis(&tf, 0, 0, d2h_fis); rc = sata_link_hardreset(link, timing, deadline, &online,