[alsa-devel] [PATCHv4 1/3] ACPI: Provide acpi_dev_name accessor for struct acpi_device device name

Jarkko Nikula jarkko.nikula at linux.intel.com
Thu Nov 14 13:03:51 CET 2013

struct acpi_device fields are only available when CONFIG_ACPI is set. We may
find use for dev_name(&adev->dev) in generic code that is build also without
CONFIG_ACPI is set but currently this requires #ifdef CONFIG_ACPI churn.

Provide here an accessor that returns dev_name of embedded struct device dev
in struct acpi_device or NULL depending on CONFIG_ACPI setting.

Signed-off-by: Jarkko Nikula <jarkko.nikula at linux.intel.com>
 include/linux/acpi.h | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/include/linux/acpi.h b/include/linux/acpi.h
index 0da49ed..844e7ff 100644
--- a/include/linux/acpi.h
+++ b/include/linux/acpi.h
@@ -53,6 +53,11 @@ static inline acpi_handle acpi_device_handle(struct acpi_device *adev)
 #define ACPI_COMPANION_SET(dev, adev)	ACPI_COMPANION(dev) = (adev)
 #define ACPI_HANDLE(dev)		acpi_device_handle(ACPI_COMPANION(dev))
+static inline const char *acpi_dev_name(struct acpi_device *adev)
+	return dev_name(&adev->dev);
 enum acpi_irq_model_id {
@@ -420,6 +425,11 @@ static inline bool acpi_driver_match_device(struct device *dev,
 #define ACPI_COMPANION_SET(dev, adev)	do { } while (0)
 #define ACPI_HANDLE(dev)		(NULL)
+static inline const char *acpi_dev_name(struct acpi_device *adev)
+	return NULL;
 static inline void acpi_early_init(void) { }
 static inline int early_acpi_boot_init(void)

More information about the Alsa-devel mailing list