From patchwork Fri Apr 12 15:44:19 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jiang Liu X-Patchwork-Id: 2436611 X-Patchwork-Delegate: bhelgaas@google.com Return-Path: X-Original-To: patchwork-linux-pci@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id A49A03FE81 for ; Fri, 12 Apr 2013 15:46:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756169Ab3DLPqo (ORCPT ); Fri, 12 Apr 2013 11:46:44 -0400 Received: from mail-pb0-f47.google.com ([209.85.160.47]:38187 "EHLO mail-pb0-f47.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755931Ab3DLPql (ORCPT ); Fri, 12 Apr 2013 11:46:41 -0400 Received: by mail-pb0-f47.google.com with SMTP id rq13so1488212pbb.20 for ; Fri, 12 Apr 2013 08:46:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references; bh=7TXRnKnaYShuJaJiA/I+ZkK7XY54wd1FT88Nb/X7/mI=; b=ZivWLmhz3ppqnLxUmO0DcDLfZrAzo/7kHYvP5eeYxT4wDJVwNeRqyvhDklbqPda2h6 U6scjhePLsRC+ZJGt+LBCMQkWwMQUjJ8/KGOpllLT6ds0fLpxygt0j0MDCN7c1jU1at2 RWa6XHF+/KDs6nuQIMVX+GajY/aEWeA6yMyxS1242dXUPcsVLB8gBoHWrKeoimviVmiB /XJgzeY30JNuftPrKow8KX5+ueth5m+7/UMr3z7FaiRCfdppm6C9nhlVWKlWG4Cr9rk/ qPXBskSVm2QqUEy8X9ZcjhMNPltmoWMkw6KsvJ10U5dloQ0stFgB2nX0zysBT88UISl8 KvXQ== X-Received: by 10.66.13.35 with SMTP id e3mr16298902pac.186.1365781601256; Fri, 12 Apr 2013 08:46:41 -0700 (PDT) Received: from localhost.localdomain ([114.250.74.212]) by mx.google.com with ESMTPS id wz9sm9048741pbc.5.2013.04.12.08.46.34 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 12 Apr 2013 08:46:40 -0700 (PDT) From: Jiang Liu To: Bjorn Helgaas , "Rafael J . Wysocki" Cc: Jiang Liu , Yinghai Lu , Yijing Wang , Jiang Liu , linux-kernel@vger.kernel.org, linux-pci@vger.kernel.org, Greg Kroah-Hartman , ACPI Devel Maling List , Toshi Kani , Myron Stowe , "Rafael J. Wysocki" Subject: [PATCH v9 05/16] ACPI/acpiphp: replace local macros with standard ACPI macros Date: Fri, 12 Apr 2013 23:44:19 +0800 Message-Id: <1365781470-32379-6-git-send-email-jiang.liu@huawei.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1365781470-32379-1-git-send-email-jiang.liu@huawei.com> References: <1365781470-32379-1-git-send-email-jiang.liu@huawei.com> Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org Replace local defined macros (ACPI_STA_xxx) with standard ACPI macros (ACPI_STA_DEVICE_xxx). Signed-off-by: Jiang Liu Signed-off-by: Yijing Wang Cc: Yinghai Lu Cc: "Rafael J. Wysocki" Cc: Toshi Kani Cc: linux-pci@vger.kernel.org Cc: linux-kernel@vger.kernel.org --- drivers/pci/hotplug/acpiphp.h | 4 ---- drivers/pci/hotplug/acpiphp_glue.c | 4 ++-- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/drivers/pci/hotplug/acpiphp.h b/drivers/pci/hotplug/acpiphp.h index b70ac00..1b311f9 100644 --- a/drivers/pci/hotplug/acpiphp.h +++ b/drivers/pci/hotplug/acpiphp.h @@ -146,10 +146,6 @@ struct acpiphp_attention_info #define ACPI_PCI_HOST_HID "PNP0A03" /* ACPI _STA method value (ignore bit 4; battery present) */ -#define ACPI_STA_PRESENT (0x00000001) -#define ACPI_STA_ENABLED (0x00000002) -#define ACPI_STA_SHOW_IN_UI (0x00000004) -#define ACPI_STA_FUNCTIONING (0x00000008) #define ACPI_STA_ALL (0x0000000f) /* bridge flags */ diff --git a/drivers/pci/hotplug/acpiphp_glue.c b/drivers/pci/hotplug/acpiphp_glue.c index a1c8dd6..718464f 100644 --- a/drivers/pci/hotplug/acpiphp_glue.c +++ b/drivers/pci/hotplug/acpiphp_glue.c @@ -487,7 +487,7 @@ static int add_bridge(struct acpi_pci_root *root) dbg("%s: _STA evaluation failure\n", __func__); return 0; } - if ((tmp & ACPI_STA_FUNCTIONING) == 0) + if ((tmp & ACPI_STA_DEVICE_FUNCTIONING) == 0) /* don't register this object */ return 0; } @@ -1389,7 +1389,7 @@ u8 acpiphp_get_latch_status(struct acpiphp_slot *slot) sta = get_slot_status(slot); - return (sta & ACPI_STA_SHOW_IN_UI) ? 0 : 1; + return (sta & ACPI_STA_DEVICE_UI) ? 0 : 1; }