From mboxrd@z Thu Jan 1 00:00:00 1970 From: Mika Westerberg Subject: Re: [PATCH v4 1/2] acpi: add acpi_preset_companion() stub Date: Fri, 23 Oct 2015 11:33:46 +0300 Message-ID: <20151023083346.GR1526@lahna.fi.intel.com> References: <1439510358-16664-1-git-send-email-dustin@cumulusnetworks.com> <1445505462-27915-1-git-send-email-dustin@cumulusnetworks.com> <1445505462-27915-2-git-send-email-dustin@cumulusnetworks.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Return-path: Received: from mga11.intel.com ([192.55.52.93]:31958 "EHLO mga11.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751559AbbJWIdv (ORCPT ); Fri, 23 Oct 2015 04:33:51 -0400 Content-Disposition: inline In-Reply-To: <1445505462-27915-2-git-send-email-dustin@cumulusnetworks.com> Sender: linux-acpi-owner@vger.kernel.org List-Id: linux-acpi@vger.kernel.org To: Dustin Byford Cc: Wolfram Sang , Jarkko Nikula , Jean Delvare , Andy Shevchenko , linux-i2c@vger.kernel.org, linux-acpi@vger.kernel.org, linux-kernel@vger.kernel.org, rjw@rjwysocki.net, "Puustinen, Ismo" On Thu, Oct 22, 2015 at 02:17:41AM -0700, Dustin Byford wrote: > Add a stub for acpi_preset_companion(). Fixes build failures when > acpi_preset_companion() is used and CONFIG_ACPI is not set. > > Signed-off-by: Dustin Byford > --- > include/linux/acpi.h | 6 ++++++ > 1 file changed, 6 insertions(+) > > diff --git a/include/linux/acpi.h b/include/linux/acpi.h > index 51a96a8..66564f8 100644 > --- a/include/linux/acpi.h > +++ b/include/linux/acpi.h > @@ -505,6 +505,12 @@ static inline bool has_acpi_companion(struct device *dev) > return false; > } > > +static inline void acpi_preset_companion(struct device *dev, > + struct acpi_device *parent, u64 addr) > +{ > + return; This return is not needed. Acked-by: Mika Westerberg > +} > + > static inline const char *acpi_dev_name(struct acpi_device *adev) > { > return NULL; > -- > 2.1.4