From patchwork Thu Nov 14 12:03:51 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jarkko Nikula X-Patchwork-Id: 291192 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id A69F92C008C for ; Thu, 14 Nov 2013 23:04:20 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753331Ab3KNMET (ORCPT ); Thu, 14 Nov 2013 07:04:19 -0500 Received: from mga03.intel.com ([143.182.124.21]:31599 "EHLO mga03.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753328Ab3KNMET (ORCPT ); Thu, 14 Nov 2013 07:04:19 -0500 Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by azsmga101.ch.intel.com with ESMTP; 14 Nov 2013 04:04:18 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.93,699,1378882800"; d="scan'208";a="427541971" Received: from mylly.fi.intel.com (HELO mylly.fi.intel.com.) ([10.237.72.158]) by fmsmga001.fm.intel.com with ESMTP; 14 Nov 2013 04:04:02 -0800 From: Jarkko Nikula To: "Rafael J. Wysocki" , Mark Brown , Wolfram Sang Cc: linux-spi@vger.kernel.org, linux-i2c@vger.kernel.org, alsa-devel@alsa-project.org, linux-acpi@vger.kernel.org, Jarkko Nikula Subject: [PATCHv4 1/3] ACPI: Provide acpi_dev_name accessor for struct acpi_device device name Date: Thu, 14 Nov 2013 14:03:51 +0200 Message-Id: <1384430633-23426-2-git-send-email-jarkko.nikula@linux.intel.com> X-Mailer: git-send-email 1.8.4.2 In-Reply-To: <1384430633-23426-1-git-send-email-jarkko.nikula@linux.intel.com> References: <1384419661-28293-1-git-send-email-jarkko.nikula@linux.intel.com> <1384430633-23426-1-git-send-email-jarkko.nikula@linux.intel.com> Sender: linux-i2c-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-i2c@vger.kernel.org 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 --- 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 { ACPI_IRQ_MODEL_PIC = 0, ACPI_IRQ_MODEL_IOAPIC, @@ -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)