Commit bdeabccd authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

Merge branches 'acpi-ec', 'acpi-fan', 'acpi-video' and 'acpi-misc' 

* acpi-ec:
  ACPI / EC: Deny write access unless requested by module param

* acpi-fan:
  ACPI / fan: Make struct dev_pm_ops const

* acpi-video:
  ACPI / video: remove unused device_decode array

* acpi-misc:
  ACPI / util: remove redundant check if element is NULL
  ACPI: Add acpi_force_32bit_fadt_addr option to force 32 bit FADT addresses
  drivers/acpi: make pmic/intel_pmic_crc.c explicitly non-modular
  drivers/acpi: make apei/ghes.c more explicitly non-modular
  drivers/acpi: make bgrt driver explicitly non-modular
parents 02fd4e76 1b6e75ee 1d751584 0f9aeb7a bea3c377

Documentation/kernel-parameters.txt

+6 −0
Original line number Diff line number Diff line
@@ -193,6 +193,12 @@ bytes respectively. Such letter suffixes can also be entirely omitted. 
			(e.g. thinkpad_acpi, sony_acpi, etc.) instead

			of the ACPI video.ko driver.



	acpi_force_32bit_fadt_addr

			force FADT to use 32 bit addresses rather than the

			64 bit X_* addresses. Some firmware have broken 64

			bit addresses for force ACPI ignore these and use

			the older legacy 32 bit addresses.



	acpica_no_return_repair [HW, ACPI]

			Disable AML predefined validation mechanism

			This mechanism can repair the evaluation result to make

drivers/acpi/acpi_video.c

+0 −7
Original line number Diff line number Diff line
@@ -218,13 +218,6 @@ struct acpi_video_device { 
	struct thermal_cooling_device *cooling_dev;

};



static const char device_decode[][30] = {

	"motherboard VGA device",

	"PCI VGA device",

	"AGP VGA device",

	"UNKNOWN",

};



static void acpi_video_device_notify(acpi_handle handle, u32 event, void *data);

static void acpi_video_device_rebind(struct acpi_video_bus *video);

static void acpi_video_device_bind(struct acpi_video_bus *video,

drivers/acpi/apei/ghes.c

+7 −16
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ 
 */



#include <linux/kernel.h>

#include <linux/module.h>

#include <linux/moduleparam.h>

#include <linux/init.h>

#include <linux/acpi.h>

#include <linux/io.h>
@@ -79,6 +79,11 @@ 
	((struct acpi_hest_generic_status *)				\

	 ((struct ghes_estatus_node *)(estatus_node) + 1))



/*

 * This driver isn't really modular, however for the time being,

 * continuing to use module_param is the easiest way to remain

 * compatible with existing boot arg use cases.

 */

bool ghes_disable;

module_param_named(disable, ghes_disable, bool, 0);
@@ -1148,18 +1153,4 @@ err_ioremap_exit: 
err:

	return rc;

}



static void __exit ghes_exit(void)

{

	platform_driver_unregister(&ghes_platform_driver);

	ghes_estatus_pool_exit();

	ghes_ioremap_exit();

}



module_init(ghes_init);

module_exit(ghes_exit);



MODULE_AUTHOR("Huang Ying");

MODULE_DESCRIPTION("APEI Generic Hardware Error Source support");

MODULE_LICENSE("GPL");

MODULE_ALIAS("platform:GHES");
 
device_initcall(ghes_init);

drivers/acpi/bgrt.c

+3 −7
Original line number Diff line number Diff line 
/*

 * BGRT boot graphic support

 * Authors: Matthew Garrett, Josh Triplett <josh@joshtriplett.org>

 * Copyright 2012 Red Hat, Inc <mjg@redhat.com>

 * Copyright 2012 Intel Corporation

 *
@@ -8,7 +10,6 @@ 
 */



#include <linux/kernel.h>

#include <linux/module.h>

#include <linux/init.h>

#include <linux/device.h>

#include <linux/sysfs.h>
@@ -103,9 +104,4 @@ out_kobject: 
	kobject_put(bgrt_kobj);

	return ret;

}



module_init(bgrt_init);



MODULE_AUTHOR("Matthew Garrett, Josh Triplett <josh@joshtriplett.org>");

MODULE_DESCRIPTION("BGRT boot graphic support");

MODULE_LICENSE("GPL");
 
device_initcall(bgrt_init);

drivers/acpi/ec_sys.c

+3 −0
Original line number Diff line number Diff line
@@ -73,6 +73,9 @@ static ssize_t acpi_ec_write_io(struct file *f, const char __user *buf, 
	loff_t init_off = *off;

	int err = 0;



	if (!write_support)

		return -EINVAL;



	if (*off >= EC_SPACE_SIZE)

		return 0;

	if (*off + count >= EC_SPACE_SIZE) {

CRA Git | Maintained and supported by SUSTech CRA and CCSE