diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-01-17 01:59:38 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-01-17 01:59:38 +0100 |
| commit | bc411b8a643825b634916f9ba167546a88a0ac28 (patch) | |
| tree | 9243b5c8139391e003e31bea845a59975aeced3e /include | |
| parent | 8341ecc9f4eb7513951bd1986d78185a11ac6d4e (diff) | |
| parent | b9f73067f32531db608e469a9ad20ce631e34550 (diff) | |
Merge branch 'acpi-modules'
* acpi-modules:
platform: introduce OF style 'modalias' support for platform bus
ACPI: fix module autoloading for ACPI enumerated devices
ACPI: add module autoloading support for ACPI enumerated devices
ACPI: fix create_modalias() return value handling
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/acpi.h | 15 | ||||
| -rw-r--r-- | include/linux/of_device.h | 6 |
2 files changed, 21 insertions, 0 deletions
diff --git a/include/linux/acpi.h b/include/linux/acpi.h index 3e3247d95fd9..1151a1dcfe41 100644 --- a/include/linux/acpi.h +++ b/include/linux/acpi.h @@ -416,6 +416,9 @@ static inline bool acpi_driver_match_device(struct device *dev, return !!acpi_match_device(drv->acpi_match_table, dev); } +int acpi_device_uevent_modalias(struct device *, struct kobj_uevent_env *); +int acpi_device_modalias(struct device *, char *, int); + #define ACPI_PTR(_ptr) (_ptr) #else /* !CONFIG_ACPI */ @@ -495,6 +498,18 @@ static inline bool acpi_driver_match_device(struct device *dev, return false; } +static inline int acpi_device_uevent_modalias(struct device *dev, + struct kobj_uevent_env *env) +{ + return -ENODEV; +} + +static inline int acpi_device_modalias(struct device *dev, + char *buf, int size) +{ + return -ENODEV; +} + #define ACPI_PTR(_ptr) (NULL) #endif /* !CONFIG_ACPI */ diff --git a/include/linux/of_device.h b/include/linux/of_device.h index 82ce324fdce7..8d7dd6768cb7 100644 --- a/include/linux/of_device.h +++ b/include/linux/of_device.h @@ -64,6 +64,12 @@ static inline int of_driver_match_device(struct device *dev, static inline void of_device_uevent(struct device *dev, struct kobj_uevent_env *env) { } +static inline int of_device_get_modalias(struct device *dev, + char *str, ssize_t len) +{ + return -ENODEV; +} + static inline int of_device_uevent_modalias(struct device *dev, struct kobj_uevent_env *env) { |