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
This commit is contained in:
Rafael J. Wysocki 2014-01-17 01:59:38 +01:00
commit bc411b8a64
7 changed files with 127 additions and 7 deletions

View file

@ -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 */