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

Merge branches 'acpi-video', 'acpi-battery', 'acpi-spcr' and 'acpi-misc' 

* acpi-video:
  ACPI / video: Add force_none quirk for Dell OptiPlex 9020M

* acpi-battery:
  ACPI: make device_attribute const

* acpi-spcr:
  ACPI: SPCR: work around clock issue on xgene UART
  ACPI: SPCR: extend XGENE 8250 workaround to m400

* acpi-misc:
  ACPI / dock: constify attribute_group structure
  MAINTAINERS: Add Tony and Boris as ACPI/APEI reviewers
  ACPI / lpat: Fix typos in comments and kerneldoc style
  MAINTAINERS: device property: ACPI: add fwnode.h
parents 01d2f105 1f59ab27 82d2b610 03c3876f 19dc7134

MAINTAINERS

+9 −0
Original line number Diff line number Diff line
@@ -301,6 +301,7 @@ S: Supported 
F:	drivers/acpi/

F:	drivers/pnp/pnpacpi/

F:	include/linux/acpi.h

F:	include/linux/fwnode.h

F:	include/acpi/

F:	Documentation/acpi/

F:	Documentation/ABI/testing/sysfs-bus-acpi
@@ -310,6 +311,14 @@ F: drivers/pci/*/*acpi* 
F:	drivers/pci/*/*/*acpi*

F:	tools/power/acpi/



ACPI APEI

M:	"Rafael J. Wysocki" <rjw@rjwysocki.net>

M:	Len Brown <lenb@kernel.org>

L:	linux-acpi@vger.kernel.org

R:	Tony Luck <tony.luck@intel.com>

R:	Borislav Petkov <bp@alien8.de>

F:	drivers/acpi/apei/



ACPI COMPONENT ARCHITECTURE (ACPICA)

M:	Robert Moore <robert.moore@intel.com>

M:	Lv Zheng <lv.zheng@intel.com>

drivers/acpi/acpi_lpat.c

+3 −3
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ 
 * @raw: the raw value, used as a key to get the temerature from the

 *       above mapping table

 *

 * A positive converted temperarure value will be returned on success,

 * A positive converted temperature value will be returned on success,

 * a negative errno will be returned in error cases.

 */

int acpi_lpat_raw_to_temp(struct acpi_lpat_conversion_table *lpat_table,
@@ -55,11 +55,11 @@ EXPORT_SYMBOL_GPL(acpi_lpat_raw_to_temp); 
 * acpi_lpat_temp_to_raw(): Return raw value from temperature through

 * LPAT conversion table

 *

 * @lpat: the temperature_raw mapping table

 * @lpat_table: the temperature_raw mapping table

 * @temp: the temperature, used as a key to get the raw value from the

 *        above mapping table

 *

 * A positive converted temperature value will be returned on success,

 * The raw value will be returned on success,

 * a negative errno will be returned in error cases.

 */

int acpi_lpat_temp_to_raw(struct acpi_lpat_conversion_table *lpat_table,

drivers/acpi/battery.c

+1 −1
Original line number Diff line number Diff line
@@ -620,7 +620,7 @@ static ssize_t acpi_battery_alarm_store(struct device *dev, 
	return count;

}



static struct device_attribute alarm_attr = {

static const struct device_attribute alarm_attr = {

	.attr = {.name = "alarm", .mode = 0644},

	.show = acpi_battery_alarm_show,

	.store = acpi_battery_alarm_store,

drivers/acpi/dock.c

+1 −1
Original line number Diff line number Diff line
@@ -585,7 +585,7 @@ static struct attribute *dock_attributes[] = { 
	NULL

};



static struct attribute_group dock_attribute_group = {

static const struct attribute_group dock_attribute_group = {

	.attrs = dock_attributes

};

drivers/acpi/sbs.c

+1 −1
Original line number Diff line number Diff line
@@ -474,7 +474,7 @@ static ssize_t acpi_battery_alarm_store(struct device *dev, 
	return count;

}



static struct device_attribute alarm_attr = {

static const struct device_attribute alarm_attr = {

	.attr = {.name = "alarm", .mode = 0644},

	.show = acpi_battery_alarm_show,

	.store = acpi_battery_alarm_store,

CRA Git | Maintained and supported by SUSTech CRA and CCSE