From patchwork Mon Feb 8 15:01:02 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 378567 Delivered-To: patch@linaro.org Received: by 2002:a02:b18a:0:0:0:0:0 with SMTP id t10csp4781511jah; Mon, 8 Feb 2021 07:32:17 -0800 (PST) X-Google-Smtp-Source: ABdhPJzDTwd/Nno9lLbUPxLIbvfLzGdkkR/VxrN5DYv/+sr96ky5h1qSMxwSbhPeVssA3hDklqr+ X-Received: by 2002:a17:906:35d9:: with SMTP id p25mr17368889ejb.398.1612798337741; Mon, 08 Feb 2021 07:32:17 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1612798337; cv=none; d=google.com; s=arc-20160816; b=KaQNiR8F446XwUSSwhGJs9UhuIwjJdATMgcS3SVev7yD7LMmZSkiIHwnGf2l9iNVQv IJAVIVSt0akpeOQJvgdX7e6hLeovQSXnO/7tPw8e64/Q65AOlysimJ8vdwILwPme70ZE wiYL2+Oa4bCGBlfjHgQYxziXRnk1POAfWKjbxGTl5ugLq8nuNs+U4vHbSkVg92mtPYis e4YwVaGdmqKQvCsvruc1opiePA4IsgU54BJJsuOlyyE4ypt5wF+cvCSIP/H89SwYj7QO +aM12d/4m38unz6xYDC84sByieBt1osUgpdVzpNRHJIVmIAU1cNT0zGZdvPm/W9ZcPki sC+g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=NMjnZNt+7+X3+q4ZS3taHFG6lc1DoxWhdY74CCM3PZI=; b=i+a8m7LufUqQEPuvs/T8qFcGwvciHYkSDa3kkk6GqNq9N+IvEMFQOuYJLm+7CuhWUu JHwAoO2AdRmXzyLH4z57ZgzP4ajXVTosr+lBxeSEEWumCnuyzFj9IQhohx+4WoG+BAtC PydmOTZdBt1erNXx0fFRLFQqInchzOG3mo6xMRA/qh8lY7UlQN5ePuBPce5zqVs9w5CK AqntGtGzT/ab98Y02QNDmkM/Rxv+6V/64IV8Lr57PVwNLm0SJDtKHJ8NN8JghVB8pr0e XieCbhS8979vGhFr+g+LIwrKDf1l/eLpo7gaDaASdvNFjGK4d3X3ewWffzUP/GjNbCKo cHVw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b="fR3/pkTN"; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id e23si3907805ejj.298.2021.02.08.07.32.17; Mon, 08 Feb 2021 07:32:17 -0800 (PST) Received-SPF: pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b="fR3/pkTN"; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233858AbhBHPbP (ORCPT + 13 others); Mon, 8 Feb 2021 10:31:15 -0500 Received: from mail.kernel.org ([198.145.29.99]:36904 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232216AbhBHP0x (ORCPT ); Mon, 8 Feb 2021 10:26:53 -0500 Received: by mail.kernel.org (Postfix) with ESMTPSA id 5D36564F00; Mon, 8 Feb 2021 15:15:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1612797337; bh=7MTfk6n6glJXE0u304vVJG6k0fJP8beLHRBuhlEp31U=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=fR3/pkTNyF89wLDA4l904G5Ohw+1H9rvYZz1zBSTxYd+tS9roq0mVNmxGyQFmKQAx J7Myko80GzZsYfa1uiBFgt0IDfs4XNIbVJ2M/MSyKPcJO71SECM3zZz30t/VGgJRQR TrvGsSuqwTdeWG216mgxdKPqakoplACP/ElSRrZQ= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Arnd Bergmann , Florian Fainelli , Nicolas Schichan , Ulf Hansson Subject: [PATCH 5.10 075/120] mmc: sdhci-pltfm: Fix linking err for sdhci-brcmstb Date: Mon, 8 Feb 2021 16:01:02 +0100 Message-Id: <20210208145821.401880161@linuxfoundation.org> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20210208145818.395353822@linuxfoundation.org> References: <20210208145818.395353822@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Ulf Hansson commit d7fb9c24209556478e65211d7a1f056f2d43cceb upstream. The implementation of sdhci_pltfm_suspend() is only available when CONFIG_PM_SLEEP is set, which triggers a linking error: "undefined symbol: sdhci_pltfm_suspend" when building sdhci-brcmstb.c. Fix this by implementing the missing stubs when CONFIG_PM_SLEEP is unset. Reported-by: Arnd Bergmann Suggested-by: Florian Fainelli Fixes: 5b191dcba719 ("mmc: sdhci-brcmstb: Fix mmc timeout errors on S5 suspend") Cc: stable@vger.kernel.org Tested-By: Nicolas Schichan Acked-by: Arnd Bergmann Acked-by: Florian Fainelli Signed-off-by: Ulf Hansson Signed-off-by: Greg Kroah-Hartman --- drivers/mmc/host/sdhci-pltfm.h | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) --- a/drivers/mmc/host/sdhci-pltfm.h +++ b/drivers/mmc/host/sdhci-pltfm.h @@ -111,8 +111,13 @@ static inline void *sdhci_pltfm_priv(str return host->private; } +extern const struct dev_pm_ops sdhci_pltfm_pmops; +#ifdef CONFIG_PM_SLEEP int sdhci_pltfm_suspend(struct device *dev); int sdhci_pltfm_resume(struct device *dev); -extern const struct dev_pm_ops sdhci_pltfm_pmops; +#else +static inline int sdhci_pltfm_suspend(struct device *dev) { return 0; } +static inline int sdhci_pltfm_resume(struct device *dev) { return 0; } +#endif #endif /* _DRIVERS_MMC_SDHCI_PLTFM_H */