diff options
| author | Len Brown <len.brown@intel.com> | 2008-10-22 23:28:38 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2008-10-22 23:28:38 -0400 |
| commit | 5f50ef453dcb05115fc98f244b8f10bfacd4b8b7 (patch) | |
| tree | 1999a7e6d242198d48f0089c7995a50f339fa3e4 /include/acpi | |
| parent | 530bc23bfeaa9156003afbeb9708fd03a5f1c73c (diff) | |
| parent | e3deda9c87ac5eef2b5d18cd0b5511370979ca26 (diff) | |
Merge branch 'misc' into test
Diffstat (limited to 'include/acpi')
| -rw-r--r-- | include/acpi/acpi_bus.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/include/acpi/acpi_bus.h b/include/acpi/acpi_bus.h index f74f882609f8..c1b5556c985d 100644 --- a/include/acpi/acpi_bus.h +++ b/include/acpi/acpi_bus.h | |||
| @@ -300,7 +300,11 @@ struct acpi_device { | |||
| 300 | enum acpi_bus_removal_type removal_type; /* indicate for different removal type */ | 300 | enum acpi_bus_removal_type removal_type; /* indicate for different removal type */ |
| 301 | }; | 301 | }; |
| 302 | 302 | ||
| 303 | #define acpi_driver_data(d) ((d)->driver_data) | 303 | static inline void *acpi_driver_data(struct acpi_device *d) |
| 304 | { | ||
| 305 | return d->driver_data; | ||
| 306 | } | ||
| 307 | |||
| 304 | #define to_acpi_device(d) container_of(d, struct acpi_device, dev) | 308 | #define to_acpi_device(d) container_of(d, struct acpi_device, dev) |
| 305 | #define to_acpi_driver(d) container_of(d, struct acpi_driver, drv) | 309 | #define to_acpi_driver(d) container_of(d, struct acpi_driver, drv) |
| 306 | 310 | ||