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

Merge branches 'acpi-misc', 'acpi-cppc', 'acpi-docs', 'acpi-config' and 'acpi-apei' 

* acpi-misc:
  ACPI: Test for ACPI_SUCCESS rather than !ACPI_FAILURE
  ACPI: Use DEVICE_ATTR_<RW|RO|WO> macros

* acpi-cppc:
  ACPI: CPPC: initialise vaddr pointers to NULL
  ACPI: CPPC: add __iomem annotation to generic_comm_base pointer
  ACPI: CPPC: remove __iomem annotation for cpc_reg's address

* acpi-docs:
  Documentation: ACPI: add new rule for gpio-line-names

* acpi-config:
  ACPI: configfs: add missing check after configfs_register_default_group()

* acpi-apei:
  ACPI: APEI: ERST: remove unneeded semicolon
  ACPI: APEI: Add is_generic_error() to identify GHES sources
parents 8af4d378 10e92724 26692cd9 731e97e0 67e40054 4ffa84b8

Documentation/firmware-guide/acpi/gpio-properties.rst

+1 −0
Original line number Diff line number Diff line
@@ -146,6 +146,7 @@ following rules (see also the examples): 
    other words, it is not mandatory to fill all the GPIO lines

  - empty names are allowed (two quotation marks ``""`` correspond to an empty

    name)

  - names inside one GPIO controller/expander must be unique



Example of a GPIO controller of 16 lines, with an incomplete list with two

empty names::

drivers/acpi/acpi_configfs.c

+6 −1
Original line number Diff line number Diff line
@@ -268,7 +268,12 @@ static int __init acpi_configfs_init(void) 


	acpi_table_group = configfs_register_default_group(root, "table",

							   &acpi_tables_type);

	return PTR_ERR_OR_ZERO(acpi_table_group);

	if (IS_ERR(acpi_table_group)) {

		configfs_unregister_subsystem(&acpi_configfs);

		return PTR_ERR(acpi_table_group);

	}



	return 0;

}

module_init(acpi_configfs_init);

drivers/acpi/acpi_pad.c

+9 −15
Original line number Diff line number Diff line
@@ -261,7 +261,7 @@ static uint32_t acpi_pad_idle_cpus_num(void) 
	return ps_tsk_num;

}



static ssize_t acpi_pad_rrtime_store(struct device *dev,

static ssize_t rrtime_store(struct device *dev,

	struct device_attribute *attr, const char *buf, size_t count)

{

	unsigned long num;
@@ -275,16 +275,14 @@ static ssize_t acpi_pad_rrtime_store(struct device *dev, 
	return count;

}



static ssize_t acpi_pad_rrtime_show(struct device *dev,

static ssize_t rrtime_show(struct device *dev,

	struct device_attribute *attr, char *buf)

{

	return scnprintf(buf, PAGE_SIZE, "%d\n", round_robin_time);

}

static DEVICE_ATTR(rrtime, S_IRUGO|S_IWUSR,

	acpi_pad_rrtime_show,

	acpi_pad_rrtime_store);

static DEVICE_ATTR_RW(rrtime);



static ssize_t acpi_pad_idlepct_store(struct device *dev,

static ssize_t idlepct_store(struct device *dev,

	struct device_attribute *attr, const char *buf, size_t count)

{

	unsigned long num;
@@ -298,16 +296,14 @@ static ssize_t acpi_pad_idlepct_store(struct device *dev, 
	return count;

}



static ssize_t acpi_pad_idlepct_show(struct device *dev,

static ssize_t idlepct_show(struct device *dev,

	struct device_attribute *attr, char *buf)

{

	return scnprintf(buf, PAGE_SIZE, "%d\n", idle_pct);

}

static DEVICE_ATTR(idlepct, S_IRUGO|S_IWUSR,

	acpi_pad_idlepct_show,

	acpi_pad_idlepct_store);

static DEVICE_ATTR_RW(idlepct);



static ssize_t acpi_pad_idlecpus_store(struct device *dev,

static ssize_t idlecpus_store(struct device *dev,

	struct device_attribute *attr, const char *buf, size_t count)

{

	unsigned long num;
@@ -319,16 +315,14 @@ static ssize_t acpi_pad_idlecpus_store(struct device *dev, 
	return count;

}



static ssize_t acpi_pad_idlecpus_show(struct device *dev,

static ssize_t idlecpus_show(struct device *dev,

	struct device_attribute *attr, char *buf)

{

	return cpumap_print_to_pagebuf(false, buf,

				       to_cpumask(pad_busy_cpus_bits));

}



static DEVICE_ATTR(idlecpus, S_IRUGO|S_IWUSR,

	acpi_pad_idlecpus_show,

	acpi_pad_idlecpus_store);

static DEVICE_ATTR_RW(idlecpus);



static int acpi_pad_add_sysfs(struct acpi_device *device)

{

drivers/acpi/acpi_tad.c

+7 −7
Original line number Diff line number Diff line
@@ -237,7 +237,7 @@ static ssize_t time_show(struct device *dev, struct device_attribute *attr, 
		       rt.tz, rt.daylight);

}



static DEVICE_ATTR(time, S_IRUSR | S_IWUSR, time_show, time_store);

static DEVICE_ATTR_RW(time);



static struct attribute *acpi_tad_time_attrs[] = {

	&dev_attr_time.attr,
@@ -446,7 +446,7 @@ static ssize_t ac_alarm_show(struct device *dev, struct device_attribute *attr, 
	return acpi_tad_alarm_read(dev, buf, ACPI_TAD_AC_TIMER);

}



static DEVICE_ATTR(ac_alarm, S_IRUSR | S_IWUSR, ac_alarm_show, ac_alarm_store);

static DEVICE_ATTR_RW(ac_alarm);



static ssize_t ac_policy_store(struct device *dev, struct device_attribute *attr,

			       const char *buf, size_t count)
@@ -462,7 +462,7 @@ static ssize_t ac_policy_show(struct device *dev, struct device_attribute *attr, 
	return acpi_tad_policy_read(dev, buf, ACPI_TAD_AC_TIMER);

}



static DEVICE_ATTR(ac_policy, S_IRUSR | S_IWUSR, ac_policy_show, ac_policy_store);

static DEVICE_ATTR_RW(ac_policy);



static ssize_t ac_status_store(struct device *dev, struct device_attribute *attr,

			       const char *buf, size_t count)
@@ -478,7 +478,7 @@ static ssize_t ac_status_show(struct device *dev, struct device_attribute *attr, 
	return acpi_tad_status_read(dev, buf, ACPI_TAD_AC_TIMER);

}



static DEVICE_ATTR(ac_status, S_IRUSR | S_IWUSR, ac_status_show, ac_status_store);

static DEVICE_ATTR_RW(ac_status);



static struct attribute *acpi_tad_attrs[] = {

	&dev_attr_caps.attr,
@@ -505,7 +505,7 @@ static ssize_t dc_alarm_show(struct device *dev, struct device_attribute *attr, 
	return acpi_tad_alarm_read(dev, buf, ACPI_TAD_DC_TIMER);

}



static DEVICE_ATTR(dc_alarm, S_IRUSR | S_IWUSR, dc_alarm_show, dc_alarm_store);

static DEVICE_ATTR_RW(dc_alarm);



static ssize_t dc_policy_store(struct device *dev, struct device_attribute *attr,

			       const char *buf, size_t count)
@@ -521,7 +521,7 @@ static ssize_t dc_policy_show(struct device *dev, struct device_attribute *attr, 
	return acpi_tad_policy_read(dev, buf, ACPI_TAD_DC_TIMER);

}



static DEVICE_ATTR(dc_policy, S_IRUSR | S_IWUSR, dc_policy_show, dc_policy_store);

static DEVICE_ATTR_RW(dc_policy);



static ssize_t dc_status_store(struct device *dev, struct device_attribute *attr,

			       const char *buf, size_t count)
@@ -537,7 +537,7 @@ static ssize_t dc_status_show(struct device *dev, struct device_attribute *attr, 
	return acpi_tad_status_read(dev, buf, ACPI_TAD_DC_TIMER);

}



static DEVICE_ATTR(dc_status, S_IRUSR | S_IWUSR, dc_status_show, dc_status_store);

static DEVICE_ATTR_RW(dc_status);



static struct attribute *acpi_tad_dc_attrs[] = {

	&dev_attr_dc_alarm.attr,

drivers/acpi/apei/erst.c

+1 −1
Original line number Diff line number Diff line
@@ -688,7 +688,7 @@ static int __erst_read_from_storage(u64 record_id, u64 offset) 
			break;

		if (erst_timedout(&timeout, SPIN_UNIT))

			return -EIO;

	};

	}

	rc = apei_exec_run(&ctx, ACPI_ERST_GET_COMMAND_STATUS);

	if (rc)

		return rc;