Merge branches 'acpica', 'acpi-video' and 'device-properties'

rafaeljw · rafaeljw · commit 3e5050e60e3b · 2015-12-04T14:01:17.000+01:00
* acpica:
  ACPI: Better describe ACPI_DEBUGGER

* acpi-video:
  MAINTAINERS: ACPI / video: update a file name in drivers/acpi/

* device-properties:
  ACPI / property: fix compile error for acpi_node_get_property_reference() when CONFIG_ACPI=n
diff --git a/MAINTAINERS b/MAINTAINERS
@@ -318,7 +318,7 @@ M:	Zhang Rui <rui.zhang@intel.com>
 L:	linux-acpi@vger.kernel.org
 W:	https://01.org/linux-acpi
 S:	Supported
-F:	drivers/acpi/video.c
+F:	drivers/acpi/acpi_video.c
 
 ACPI WMI DRIVER
 L:	platform-driver-x86@vger.kernel.org
diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig
@@ -58,10 +58,10 @@ config ACPI_CCA_REQUIRED
 	bool
 
 config ACPI_DEBUGGER
-	bool "In-kernel debugger (EXPERIMENTAL)"
+	bool "AML debugger interface (EXPERIMENTAL)"
 	select ACPI_DEBUG
 	help
-	  Enable in-kernel debugging facilities: statistics, internal
+	  Enable in-kernel debugging of AML facilities: statistics, internal
 	  object dump, single step control method execution.
 	  This is still under development, currently enabling this only
 	  results in the compilation of the ACPICA debugger files.
diff --git a/include/linux/acpi.h b/include/linux/acpi.h
@@ -870,8 +870,8 @@ static inline int acpi_dev_get_property(struct acpi_device *adev,
 }
 
 static inline int acpi_node_get_property_reference(struct fwnode_handle *fwnode,
-				const char *name, const char *cells_name,
-				size_t index, struct acpi_reference_args *args)
+				const char *name, size_t index,
+				struct acpi_reference_args *args)
 {
 	return -ENXIO;
 }

Original file line number	Diff line number	Diff line change
`@@ -870,8 +870,8 @@ static inline int acpi_dev_get_property(struct acpi_device *adev,`
`870`	`870`	`}`
`871`	`871`
`872`	`872`	`static inline int acpi_node_get_property_reference(struct fwnode_handle *fwnode,`
`873`		`- const char name, const char cells_name,`
`874`		`- size_t index, struct acpi_reference_args *args)`
	`873`	`+ const char *name, size_t index,`
	`874`	`+ struct acpi_reference_args *args)`
`875`	`875`	`{`
`876`	`876`	`return -ENXIO;`
`877`	`877`	`}`