| Message ID | 1445505462-27915-2-git-send-email-dustin@cumulusnetworks.com |
|---|---|
| State | Superseded |
| Headers | show |
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 <dustin@cumulusnetworks.com> > --- > 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 <mika.westerberg@linux.intel.com> > +} > + > static inline const char *acpi_dev_name(struct acpi_device *adev) > { > return NULL; > -- > 2.1.4 -- To unsubscribe from this list: send the line "unsubscribe linux-i2c" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Thu, Oct 22, 2015 at 11:17 AM, Dustin Byford <dustin@cumulusnetworks.com> 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 <dustin@cumulusnetworks.com> Acked-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com> > --- > 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; > +} > + > static inline const char *acpi_dev_name(struct acpi_device *adev) > { > return NULL; > -- > 2.1.4 > > -- > To unsubscribe from this list: send the line "unsubscribe linux-acpi" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html -- To unsubscribe from this list: send the line "unsubscribe linux-i2c" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Sunday, October 25, 2015 02:40:10 PM Rafael J. Wysocki wrote: > On Thu, Oct 22, 2015 at 11:17 AM, Dustin Byford > <dustin@cumulusnetworks.com> 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 <dustin@cumulusnetworks.com> > > Acked-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com> > > > --- > > 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; But of course, the version without the return statement here is better. > > +} > > + > > static inline const char *acpi_dev_name(struct acpi_device *adev) > > { > > return NULL; Thanks, Rafael -- To unsubscribe from this list: send the line "unsubscribe linux-i2c" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
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; +} + static inline const char *acpi_dev_name(struct acpi_device *adev) { return NULL;
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 <dustin@cumulusnetworks.com> --- include/linux/acpi.h | 6 ++++++ 1 file changed, 6 insertions(+)