From patchwork Tue Jul 21 15:12:25 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tejun Heo X-Patchwork-Id: 30030 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.176.167]) by bilbo.ozlabs.org (Postfix) with ESMTP id A8240B707B for ; Wed, 22 Jul 2009 01:14:26 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755168AbZGUPNc (ORCPT ); Tue, 21 Jul 2009 11:13:32 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1755273AbZGUPNc (ORCPT ); Tue, 21 Jul 2009 11:13:32 -0400 Received: from hera.kernel.org ([140.211.167.34]:40356 "EHLO hera.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755168AbZGUPNb (ORCPT ); Tue, 21 Jul 2009 11:13:31 -0400 Received: from htj.dyndns.org (IDENT:U2FsdGVkX1+FyTA2eD2RTO8YggJa9W6EChIthCBac30@localhost [127.0.0.1]) by hera.kernel.org (8.14.2/8.14.2) with ESMTP id n6LFCPnc002114 (version=TLSv1/SSLv3 cipher=DHE-RSA-CAMELLIA256-SHA bits=256 verify=NO); Tue, 21 Jul 2009 15:12:28 GMT Received: from [127.0.0.2] (htj.dyndns.org [127.0.0.2]) by htj.dyndns.org (Postfix) with ESMTPSA id 72AC544B2AB94; Wed, 22 Jul 2009 00:12:25 +0900 (KST) Message-ID: <4A65DAD9.8050001@kernel.org> Date: Wed, 22 Jul 2009 00:12:25 +0900 From: Tejun Heo User-Agent: Thunderbird 2.0.0.19 (X11/20081227) MIME-Version: 1.0 To: Jeff Garzik , IDE/ATA development list , Marcus Meissner Subject: [PATCH #upstream-fixes 1/2] libata: cosmetic updates X-Enigmail-Version: 0.95.7 X-Virus-Scanned: ClamAV 0.93.3/9598/Tue Jul 21 12:05:40 2009 on hera.kernel.org X-Virus-Status: Clean X-Spam-Status: No, score=-1.7 required=5.0 tests=AWL,BAYES_00, DNS_FROM_OPENWHOIS,UNPARSEABLE_RELAY autolearn=no version=3.2.5 X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on hera.kernel.org X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.0 (hera.kernel.org [127.0.0.1]); Tue, 21 Jul 2009 15:12:29 +0000 (UTC) Sender: linux-ide-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-ide@vger.kernel.org We're about to add more SATA_* and ATA_ACPI_FILTER_* constants. Reformat them in preparation. Signed-off-by: Tejun Heo --- drivers/ata/libata-acpi.c | 12 ++++++------ include/linux/ata.h | 4 ++-- 2 files changed, 8 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: ata/drivers/ata/libata-acpi.c =================================================================== --- ata.orig/drivers/ata/libata-acpi.c +++ ata/drivers/ata/libata-acpi.c @@ -21,13 +21,13 @@ #include enum { - ATA_ACPI_FILTER_SETXFER = 1 << 0, - ATA_ACPI_FILTER_LOCK = 1 << 1, - ATA_ACPI_FILTER_DIPM = 1 << 2, + ATA_ACPI_FILTER_SETXFER = 1 << 0, + ATA_ACPI_FILTER_LOCK = 1 << 1, + ATA_ACPI_FILTER_DIPM = 1 << 2, - ATA_ACPI_FILTER_DEFAULT = ATA_ACPI_FILTER_SETXFER | - ATA_ACPI_FILTER_LOCK | - ATA_ACPI_FILTER_DIPM, + ATA_ACPI_FILTER_DEFAULT = ATA_ACPI_FILTER_SETXFER | + ATA_ACPI_FILTER_LOCK | + ATA_ACPI_FILTER_DIPM, }; static unsigned int ata_acpi_gtf_filter = ATA_ACPI_FILTER_DEFAULT; Index: ata/include/linux/ata.h =================================================================== --- ata.orig/include/linux/ata.h +++ ata/include/linux/ata.h @@ -304,8 +304,8 @@ enum { SETFEATURES_SATA_DISABLE = 0x90, /* Disable use of SATA feature */ /* SETFEATURE Sector counts for SATA features */ - SATA_AN = 0x05, /* Asynchronous Notification */ - SATA_DIPM = 0x03, /* Device Initiated Power Management */ + SATA_DIPM = 0x03, /* Device Initiated Power Management */ + SATA_AN = 0x05, /* Asynchronous Notification */ /* feature values for SET_MAX */ ATA_SET_MAX_ADDR = 0x00,