![Lv Zheng](/assets/img/avatar_default.png)
Replace direct inclusions of <acpi/acpi.h>, <acpi/acpi_bus.h> and <acpi/acpi_drivers.h>, which are incorrect, with <linux/acpi.h> inclusions and remove some inclusions of those files that aren't necessary. First of all, <acpi/acpi.h>, <acpi/acpi_bus.h> and <acpi/acpi_drivers.h> should not be included directly from any files that are built for CONFIG_ACPI unset, because that generally leads to build warnings about undefined symbols in !CONFIG_ACPI builds. For CONFIG_ACPI set, <linux/acpi.h> includes those files and for CONFIG_ACPI unset it provides stub ACPI symbols to be used in that case. Second, there are ordering dependencies between those files that always have to be met. Namely, it is required that <acpi/acpi_bus.h> be included prior to <acpi/acpi_drivers.h> so that the acpi_pci_root declarations the latter depends on are always there. And <acpi/acpi.h> which provides basic ACPICA type declarations should always be included prior to any other ACPI headers in CONFIG_ACPI builds. That also is taken care of including <linux/acpi.h> as appropriate. Signed-off-by: Lv Zheng <lv.zheng@intel.com> Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Cc: Matthew Garrett <mjg59@srcf.ucam.org> Cc: Tony Luck <tony.luck@intel.com> Cc: "H. Peter Anvin" <hpa@zytor.com> Acked-by: Bjorn Helgaas <bhelgaas@google.com> (drivers/pci stuff) Acked-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> (Xen stuff) Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
61 lines
1.6 KiB
C
61 lines
1.6 KiB
C
/*
|
|
* Copyright 2013 Matthew Garrett <mjg59@srcf.ucam.org>
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation; either version 2 of the License, or
|
|
* (at your option) any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License along
|
|
* with this program; if not, write to the Free Software Foundation, Inc.,
|
|
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
|
*/
|
|
|
|
|
|
#include <linux/init.h>
|
|
#include <linux/module.h>
|
|
#include <linux/acpi.h>
|
|
|
|
MODULE_LICENSE("GPL");
|
|
|
|
static int smartconnect_acpi_init(struct acpi_device *acpi)
|
|
{
|
|
unsigned long long value;
|
|
acpi_status status;
|
|
|
|
status = acpi_evaluate_integer(acpi->handle, "GAOS", NULL, &value);
|
|
if (!ACPI_SUCCESS(status))
|
|
return -EINVAL;
|
|
|
|
if (value & 0x1) {
|
|
dev_info(&acpi->dev, "Disabling Intel Smart Connect\n");
|
|
status = acpi_execute_simple_method(acpi->handle, "SAOS", 0);
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
static const struct acpi_device_id smartconnect_ids[] = {
|
|
{"INT33A0", 0},
|
|
{"", 0}
|
|
};
|
|
|
|
static struct acpi_driver smartconnect_driver = {
|
|
.owner = THIS_MODULE,
|
|
.name = "intel_smart_connect",
|
|
.class = "intel_smart_connect",
|
|
.ids = smartconnect_ids,
|
|
.ops = {
|
|
.add = smartconnect_acpi_init,
|
|
},
|
|
};
|
|
|
|
module_acpi_driver(smartconnect_driver);
|
|
|
|
MODULE_DEVICE_TABLE(acpi, smartconnect_ids);
|