From patchwork Thu Oct 22 09:17:41 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dustin Byford X-Patchwork-Id: 534318 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 CB47D141317 for ; Thu, 22 Oct 2015 20:27:44 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=cumulusnetworks.com header.i=@cumulusnetworks.com header.b=alBhKW+K; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965030AbbJVJSO (ORCPT ); Thu, 22 Oct 2015 05:18:14 -0400 Received: from mail-pa0-f48.google.com ([209.85.220.48]:34577 "EHLO mail-pa0-f48.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S965008AbbJVJSF (ORCPT ); Thu, 22 Oct 2015 05:18:05 -0400 Received: by padhk11 with SMTP id hk11so82234657pad.1 for ; Thu, 22 Oct 2015 02:18:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cumulusnetworks.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=XUkThqixde841bJpOX13wQiyx4HHRJwfP08R3Kgo6X8=; b=alBhKW+KAqyl+LeDHAsRNq38TcTMo7l2HfIGYFlX1NmUWRy+VODYCUFc9++YsOGKS8 Yh4KMCMW23+DQquiiNa4Ly8PkGgabYx8AmKR52hOCVr6k4gmRhvjaNx2b+pasFeArc6Y F8HEcFIXoIZsfb2cZhRkt514WB805ynyNy/rI= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=XUkThqixde841bJpOX13wQiyx4HHRJwfP08R3Kgo6X8=; b=DLpVGqOBMIw7pBrUieGtAs2Zvym4Wz2BVtMI4xj2Hjd+rNiIChuO0sM/0a2CFrAjqt wB2oet3dCRwcRyLwcfgQiVe9ShahYCr0WcD6gqVOewE8kATGBkilTY5jYEZS9aPYGjuf tk4UmriGBFtPFzop97nrUgwvcfbDaoWhayVVYn93gc0SJGAr2h6dU3siJItuboesa163 najuvqC0Vyv6pD+v1GSC4mXwCNZUMvKLf3OTee9muCsFXmki31O9eKSEiqhrdDRDMb9a /rA5anb7X9ztD6NBFsEJfBbqN9g9ZplsKMUIQnHfPUNjQsxvoYWyAKo0n79YVOGFt7vQ 0bCg== X-Gm-Message-State: ALoCoQmJTf2A4Tltr3Tj4rJ4ONMigQnMNL2Q6JxHDeqqbuWSLQBjtEj+FikO1Yb4QGNHf4rpnEOG X-Received: by 10.66.157.3 with SMTP id wi3mr16390008pab.17.1445505484337; Thu, 22 Oct 2015 02:18:04 -0700 (PDT) Received: from magnum.cumulusnetworks.com ([216.129.126.126]) by smtp.gmail.com with ESMTPSA id an5sm13046667pbd.45.2015.10.22.02.18.03 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 22 Oct 2015 02:18:03 -0700 (PDT) Received: by magnum.cumulusnetworks.com (Postfix, from userid 1016) id 467B68A1BC0; Thu, 22 Oct 2015 02:18:03 -0700 (PDT) From: Dustin Byford To: Wolfram Sang , Mika Westerberg , Jarkko Nikula , Jean Delvare , Andy Shevchenko Cc: linux-i2c@vger.kernel.org, linux-acpi@vger.kernel.org, linux-kernel@vger.kernel.org, rjw@rjwysocki.net, "Puustinen, Ismo" Subject: [PATCH v4 1/2] acpi: add acpi_preset_companion() stub Date: Thu, 22 Oct 2015 02:17:41 -0700 Message-Id: <1445505462-27915-2-git-send-email-dustin@cumulusnetworks.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1445505462-27915-1-git-send-email-dustin@cumulusnetworks.com> References: <1439510358-16664-1-git-send-email-dustin@cumulusnetworks.com> <1445505462-27915-1-git-send-email-dustin@cumulusnetworks.com> Sender: linux-i2c-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-i2c@vger.kernel.org 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 Acked-by: Mika Westerberg Acked-by: Rafael J. Wysocki --- 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;