aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/acpi.h
diff options
context:
space:
mode:
authorToshi Kani <toshi.kani@hp.com>2013-03-04 16:30:41 -0500
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2013-03-24 18:49:38 -0400
commitd4e1a692e9e85f9cbee090ea8d6158b133d32157 (patch)
treed6b76ddfc967c7631f0c192af06fb3b7b70047c6 /include/linux/acpi.h
parentb09753ec80914424527955147c359e9ac3a87682 (diff)
ACPI: Remove acpi_device dependency in acpi_device_set_id()
This patch updates the internal operations of acpi_device_set_id() to setup acpi_device_pnp without using acpi_device. There is no functional change to acpi_device_set_id() in this patch. acpi_pnp_type is added to acpi_device_pnp, so that PNPID type is self-contained within acpi_device_pnp. acpi_add_id(), acpi_bay_match(), acpi_dock_match(), acpi_ibm_smbus_match() and acpi_is_video_device() are changed to take acpi_handle as an argument, instead of acpi_device. Signed-off-by: Toshi Kani <toshi.kani@hp.com> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Diffstat (limited to 'include/linux/acpi.h')
-rw-r--r--include/linux/acpi.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/acpi.h b/include/linux/acpi.h
index bcbdd7484e58..edaf311473e5 100644
--- a/include/linux/acpi.h
+++ b/include/linux/acpi.h
@@ -204,7 +204,7 @@ extern bool wmi_has_guid(const char *guid);
204#if defined(CONFIG_ACPI_VIDEO) || defined(CONFIG_ACPI_VIDEO_MODULE) 204#if defined(CONFIG_ACPI_VIDEO) || defined(CONFIG_ACPI_VIDEO_MODULE)
205 205
206extern long acpi_video_get_capabilities(acpi_handle graphics_dev_handle); 206extern long acpi_video_get_capabilities(acpi_handle graphics_dev_handle);
207extern long acpi_is_video_device(struct acpi_device *device); 207extern long acpi_is_video_device(acpi_handle handle);
208extern void acpi_video_dmi_promote_vendor(void); 208extern void acpi_video_dmi_promote_vendor(void);
209extern void acpi_video_dmi_demote_vendor(void); 209extern void acpi_video_dmi_demote_vendor(void);
210extern int acpi_video_backlight_support(void); 210extern int acpi_video_backlight_support(void);
@@ -217,7 +217,7 @@ static inline long acpi_video_get_capabilities(acpi_handle graphics_dev_handle)
217 return 0; 217 return 0;
218} 218}
219 219
220static inline long acpi_is_video_device(struct acpi_device *device) 220static inline long acpi_is_video_device(acpi_handle handle)
221{ 221{
222 return 0; 222 return 0;
223} 223}