From patchwork Fri Sep 6 17:14:02 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bjorn Helgaas X-Patchwork-Id: 2854581 X-Patchwork-Delegate: bhelgaas@google.com Return-Path: X-Original-To: patchwork-linux-pci@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 06AF99F494 for ; Fri, 6 Sep 2013 17:14:11 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id DBDCB202C7 for ; Fri, 6 Sep 2013 17:14:09 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id DF53F202C3 for ; Fri, 6 Sep 2013 17:14:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753815Ab3IFROH (ORCPT ); Fri, 6 Sep 2013 13:14:07 -0400 Received: from mail-ye0-f172.google.com ([209.85.213.172]:33466 "EHLO mail-ye0-f172.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752739Ab3IFROG (ORCPT ); Fri, 6 Sep 2013 13:14:06 -0400 Received: by mail-ye0-f172.google.com with SMTP id m12so1013808yen.17 for ; Fri, 06 Sep 2013 10:14:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=subject:to:from:cc:date:message-id:in-reply-to:references :user-agent:mime-version:content-type:content-transfer-encoding; bh=dx8hXIIWpU2D8t1rZIAJR4XJTdfBKAIV6NmqqG3vLmk=; b=csJrahoEPAEi2eKq3sajev3rTI1BW0RWF2OGdSXgu3TF56nILWIuJLjZgUjStvcE7g XTPGnl3aLW97VR1OdN0rVk9vrbR30KcZijczsEkNFGtRBM+NycHkIvp+UXUl/oxryqdL HYsY1JaxmHUMUW9b9XiNFEGYtYNXBTqCQXOhCMxs2fU/zMJ/bAGuse5Seiqk/0Uau6gt O6tQ2LfbOHTukuiRXhFT7zGJDlpEakIKJOxDJ2ADxZw6B3w+sNEG8zi5utZE6kPI61T7 i+5zpsKJrGY9HViI6WY/oTdS1CDOYWdW7hpGKbpom4l+JYVLnvvS86CTxmEXcZBGuG+G lrUg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:subject:to:from:cc:date:message-id:in-reply-to :references:user-agent:mime-version:content-type :content-transfer-encoding; bh=dx8hXIIWpU2D8t1rZIAJR4XJTdfBKAIV6NmqqG3vLmk=; b=eT7OWg5F5CVya1aoGOj9no5QU1IE8jlgxTDHpKRCcDbpi2HYTid77Ok+58k0dbEx6d gaHmRkjOBgz7pm9Cp8cuphO0ILTFEZxdtjVq40UpGYn0IXlJaQUGdfJrGd8ij9hZFWOa yeTbDHBZdLtv+7IdFqYON7BYLQ6lZjFT9MQMbgcXQUjAf1U/H3S8rz6/mmOEYeZT21t7 xicZUvBE4mnpXCPDGhtISFgNYaRKGHRPX0BOMWWqCfUKcyVqLPq/BJhHKmur1W9DDAFo vX3I2nK8a+KdUE/2GVfqWuPtOTiU72+T2LCzGKk/9sBW0POKxewNTeSI96Y4jL6GPHkf NvkA== X-Gm-Message-State: ALoCoQkaeLta0ynnNbqfK4RUVuYTDcnRUQ/pVIBTOu/hRw5X3NMTfjaVVbSDXo7Uq9hbX4NSdFCJMlPVuUdRkw8bq2xyWSd/vwQnlEdmgi/1rwyEX1Al4dZDiLb9K4oR/43Hzv1uydAwjKLRq0Nk1ooj8JkueUoQzQUp532sBUBDkGUmWtvo6frf+lnl+oWCUF7u+y7Xdhfff1Vh6sFbE3yG9aFb8Dudst+/fExcmNc6JYUCBNBcqK4= X-Received: by 10.236.149.17 with SMTP id w17mr3160085yhj.34.1378487645686; Fri, 06 Sep 2013 10:14:05 -0700 (PDT) Received: from localhost ([172.16.53.165]) by mx.google.com with ESMTPSA id h66sm4083550yhb.7.1969.12.31.16.00.00 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Fri, 06 Sep 2013 10:14:04 -0700 (PDT) Subject: [PATCH 05/14] ACPI: Write OSC_PCI_CONTROL_MASKS like OSC_PCI_SUPPORT_MASKS To: linux-pci@vger.kernel.org From: Bjorn Helgaas Cc: "Rafael J. Wysocki" , linux-acpi@vger.kernel.org, Len Brown Date: Fri, 06 Sep 2013 11:14:02 -0600 Message-ID: <20130906171402.11482.40109.stgit@bhelgaas-glaptop> In-Reply-To: <20130906171010.11482.34235.stgit@bhelgaas-glaptop> References: <20130906171010.11482.34235.stgit@bhelgaas-glaptop> User-Agent: StGit/0.16 MIME-Version: 1.0 Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org X-Spam-Status: No, score=-9.2 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP We write OSC_PCI_SUPPORT_MASKS as a simple 0x1f, so do the same for OSC_PCI_CONTROL_MASKS. No functional change. Signed-off-by: Bjorn Helgaas --- include/linux/acpi.h | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-pci" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/include/linux/acpi.h b/include/linux/acpi.h index 94e5bca..7bda6a2 100644 --- a/include/linux/acpi.h +++ b/include/linux/acpi.h @@ -338,12 +338,7 @@ extern bool osc_sb_apei_support_acked; #define OSC_PCI_EXPRESS_PME_CONTROL 0x00000004 #define OSC_PCI_EXPRESS_AER_CONTROL 0x00000008 #define OSC_PCI_EXPRESS_CAP_STRUCTURE_CONTROL 0x00000010 - -#define OSC_PCI_CONTROL_MASKS (OSC_PCI_EXPRESS_NATIVE_HP_CONTROL | \ - OSC_SHPC_NATIVE_HP_CONTROL | \ - OSC_PCI_EXPRESS_PME_CONTROL | \ - OSC_PCI_EXPRESS_AER_CONTROL | \ - OSC_PCI_EXPRESS_CAP_STRUCTURE_CONTROL) +#define OSC_PCI_CONTROL_MASKS 0x0000001f extern acpi_status acpi_pci_osc_control_set(acpi_handle handle, u32 *mask, u32 req);