From patchwork Tue Jan 26 09:52:30 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 370592 Delivered-To: patches@linaro.org Received: by 2002:a02:a60d:0:0:0:0:0 with SMTP id c13csp4802779jam; Tue, 26 Jan 2021 01:52:35 -0800 (PST) X-Received: by 2002:a19:c519:: with SMTP id w25mr2339617lfe.16.1611654755816; Tue, 26 Jan 2021 01:52:35 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1611654755; cv=none; d=google.com; s=arc-20160816; b=tT69HyRizPPOjpA9CtEyjQTeMHSze95J27JnJsFSIEWQ6+581wpCtYRvEXdrIiZC93 Rcz/agwlVRC0azW88fEiaUfoRGkz7j2mDCKY+amW2x51oFBAZlyk2G2bT2DI6EJKzQ/9 1aF/rBH2VTBL+XYNqblyaMwflzhzr+gAjRZiEtUXNqDiKEYdo5AbA8E3QQeFXBZJEjU0 MpzvbqPL5TJQBn4Vlsspm+WG3HlHr9CoIjbHOKD1we+7V82xxtteJ//yUZ4nh6MWbvFT 6TBS2KjVw8+Cme/nU+ziEIT9T0g3gVMKuzTL5gvjf2TtDAgBMO5qaKo6tlwgliSFiDi4 S/vQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:dkim-signature; bh=Xl+szrNKltw4M9EkOt6Ku8phtfpsNC6B9vqlONxx0g4=; b=yZeoZ4Tu7aoACp/gaZb1uMwO/P6joYRSERsYax5MspZEC6RMhLyc3sCD6r+cDoXUom aln6I95NKePSr/kPzhRH0NuJnwr0EbSmJWzFTenwo1Q4VDU6l82N2BjmWsPioJaUboVM sYulwGuAyJbj/OWsuJHZD0jFlEX1mgHK8vMNSCiGixd314tMxsC5b1SxaESaXKciv96q ANz86gDQ6DOyAoGryJKC9K5m+QALbHWgETvkpQ4zrEUVAWG9Y4hcGzgY5cUVrOl7v/Lg gzMkyMahEkS1TTMEkZ/TiPCaPkx1egfLWm1HvDgk1K3/oQYO+0Fnt0gfY4vqZ6ES4Yba 7l+Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=ETXxVM2b; spf=pass (google.com: domain of ulf.hansson@linaro.org designates 209.85.220.41 as permitted sender) smtp.mailfrom=ulf.hansson@linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from mail-sor-f41.google.com (mail-sor-f41.google.com. [209.85.220.41]) by mx.google.com with SMTPS id m22sor19420ljg.28.2021.01.26.01.52.35 for (Google Transport Security); Tue, 26 Jan 2021 01:52:35 -0800 (PST) Received-SPF: pass (google.com: domain of ulf.hansson@linaro.org designates 209.85.220.41 as permitted sender) client-ip=209.85.220.41; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=ETXxVM2b; spf=pass (google.com: domain of ulf.hansson@linaro.org designates 209.85.220.41 as permitted sender) smtp.mailfrom=ulf.hansson@linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=Xl+szrNKltw4M9EkOt6Ku8phtfpsNC6B9vqlONxx0g4=; b=ETXxVM2bLAeaCcj1UVibB+xzYWVDbEQPAGexw9B8RYRZue9PL7GzvgHmtFb1o0R7oT mtB24aVlehH1AnDLZ0B/etqmD5yLUoEPaK18N3RlZhzBOOhPcEtq1BNGhUvCiUigkyT0 AWLbVzTPiW2ztrNE1OBGr3Zne1+sdlNWslLg5Pqxar6+9Cm5i4KqulWIwkRZRbKHHjKs 0x2GoyFNCwbphjOh0pcyzy1GSqn3Q18kYPBzvvq4RJ/p2qIn/3x8DdbDsRod07Kh5kPQ +jHrsl4/rIh483QgCKofWC7ei83w4/JhFrmUbnl5RKwPFXF0oGeQvBdFBHpyLVt/zfe4 wUBw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=Xl+szrNKltw4M9EkOt6Ku8phtfpsNC6B9vqlONxx0g4=; b=A5HfRQ1/wiGzAHkgbEgiaF71FZ7VvmNcZVJ1JLfpQQfN4a2+3egkRmw35BMe7SwSPX 65TApZ0JLY1Khikk3uIbID+TJ6qEELjftPZQkiOZ31jGEMp6XOHW6FGYg1xiuZKbutib pkrLh/a1yIBZ6xRMjzR0cATtPeigvVXovynLkvvKUehkJS8id5YL3+m/68SMw23IZbtJ Xu163tKIjoVGJ7Ly9Femr1GoowQckXakSQKbw4OGPnZjhV1+y7EI/dWj79ZTFieaFHEi Ccr2qKYGgAsOep1uFHUAujPjHcQPgFpz9GuYFPb/RO/9oInQDyWqoAmyNwjMjsyfW+qm Vr2Q== X-Gm-Message-State: AOAM530fy2S4fRJlMuD8e90+RJ9jdQC5SGJuFEsSJZ3ey/+kLgkpAees rDQTC5kBHCeW/Z1Q6UoxH7GHLDTr X-Google-Smtp-Source: ABdhPJwe2hBaInwMyQJ6bm/S6REpkGRtWsL6YNFzyylZ3R0mgoyfmjcIrsAuAKVG67ByJ+1FBIUMlw== X-Received: by 2002:a2e:81d1:: with SMTP id s17mr2447074ljg.49.1611654755466; Tue, 26 Jan 2021 01:52:35 -0800 (PST) Return-Path: Received: from localhost.localdomain (h-98-128-180-179.NA.cust.bahnhof.se. [98.128.180.179]) by smtp.gmail.com with ESMTPSA id x28sm2031841lfn.98.2021.01.26.01.52.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 Jan 2021 01:52:34 -0800 (PST) From: Ulf Hansson To: linux-mmc@vger.kernel.org, Ulf Hansson , Adrian Hunter Cc: Arnd Bergmann , Florian Fainelli , Nicolas Schichan , stable@vger.kernel.org Subject: [PATCH] mmc: sdhci-pltfm: Fix linking err for sdhci-brcmstb Date: Tue, 26 Jan 2021 10:52:30 +0100 Message-Id: <20210126095230.26580-1-ulf.hansson@linaro.org> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 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 Cc: Nicolas Schichan Fixes: 5b191dcba719 ("mmc: sdhci-brcmstb: Fix mmc timeout errors on S5 suspend") Cc: stable@vger.kernel.org Signed-off-by: Ulf Hansson --- drivers/mmc/host/sdhci-pltfm.h | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) -- 2.25.1 Tested-By: Nicolas Schichan Acked-by: Arnd Bergmann Acked-by: Florian Fainelli diff --git a/drivers/mmc/host/sdhci-pltfm.h b/drivers/mmc/host/sdhci-pltfm.h index 6301b81cf573..9bd717ff784b 100644 --- a/drivers/mmc/host/sdhci-pltfm.h +++ b/drivers/mmc/host/sdhci-pltfm.h @@ -111,8 +111,13 @@ static inline void *sdhci_pltfm_priv(struct sdhci_pltfm_host *host) 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 */