From patchwork Wed May 30 13:04:16 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 137259 Delivered-To: patches@linaro.org Received: by 2002:a2e:9706:0:0:0:0:0 with SMTP id r6-v6csp5296901lji; Wed, 30 May 2018 06:04:21 -0700 (PDT) X-Received: by 2002:a19:ce87:: with SMTP id e129-v6mr1767967lfg.57.1527685461030; Wed, 30 May 2018 06:04:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1527685461; cv=none; d=google.com; s=arc-20160816; b=X9oxgGjVRS40dIjjJTjB/3nA3Zd+lkyyI6SK5ysScnhNCpvuM9trolqlklEZBe8JHP IqsYgyz0jCpMbkYm60V79HKJ/qz8wLqTWOjZSoyEZxn4NNRFpUhUofi8omx00y2mpDBb 0eFjoWwdurGiQd9RitS3DjheWGRZNc58kdb3V1dZUxZDl5VEDhsjPP0lKG4sTaonwKdV yPfJjLVyfWQXRYCoXm/LN+zdaIFa4yGqLlP2lhmCxbyKw3yBSvB113l98HwJNN7Q4loq Y8KG1Fs3NvjfRp1uASN2FqXwqNF+iFeFJpSCb6JC5CFnmkYvTI7uvq/95Qdx5XMxZGNx ikRw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=message-id:date:subject:to:from:dkim-signature :arc-authentication-results; bh=22Wp1fk1tAE/nc6pWinXE1RJqT6ENTfYJhfgsJPBa88=; b=ypY4peIBeG74VAfbY14jINpZGIMWCuuqj8JMae0toEP/cXJ8r7+t0hhvIewqj6kVD2 xgu0FbGkJfuW2TdLYimPVgPQRL83rEL9y/95KcT+kAG2u3eVXSotvEqgO8qx+aWBtjwH ipm33MFuzt2OG2gxGoUbBvfCJw7rk0jdG89jkfWZGh71vya7pnwRcVm7pMGWoUbv6Iz2 HKo3+yHw2BTDUI9e6PYSVVQMbTOerSeLh8pPCof2ik/VVXrUFlW5lcrXRmg6tScXQzGA Uot7I+R2k+uDSYVOHzq0Re3YeKslh5F2pzEYZFroXczQiW0FTeohxMH16bI7Nt8MYxlS zwqA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=GFKp0QoU; spf=pass (google.com: domain of ulf.hansson@linaro.org designates 209.85.220.65 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-f65.google.com (mail-sor-f65.google.com. [209.85.220.65]) by mx.google.com with SMTPS id v8-v6sor8128074ljj.105.2018.05.30.06.04.20 for (Google Transport Security); Wed, 30 May 2018 06:04:20 -0700 (PDT) Received-SPF: pass (google.com: domain of ulf.hansson@linaro.org designates 209.85.220.65 as permitted sender) client-ip=209.85.220.65; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=GFKp0QoU; spf=pass (google.com: domain of ulf.hansson@linaro.org designates 209.85.220.65 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:subject:date:message-id; bh=22Wp1fk1tAE/nc6pWinXE1RJqT6ENTfYJhfgsJPBa88=; b=GFKp0QoU8PuYq3T5yzt3WKDKVfLKuozSb31saON3n1oyZK3lLZcch8ecs0eJbumHcz 7sEadDJiSVrrfNFFUVP+PEvnWnCbTrh3Zcr2Wco8OOBEk5AmYGjfq6ijBhVGFJ17ntDE Cx1WV84kyG6P2woyDOqVZjWEtxOBALpgjBFD4= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id; bh=22Wp1fk1tAE/nc6pWinXE1RJqT6ENTfYJhfgsJPBa88=; b=SFCAlQ1I2paGkVtF7sfchaY1iN/qGO89HN1iHccAm2wraAyoOzT7SEHD1WRZvS5fa9 N3N7u5ILy9uly6DN2dOWemPo2ft2RDTqswbSAqYkkytz3a4f66R1/kQHTbKFVD8zrfPV 3TkMXgQAZ++2PyNRhTIUS/IYPMEHfcm9GRX3zpRLl2dv7LetKkDa3QPkUfkkfAF/Ta/t Jf/4XjDI7QoqYPYCJx9N6zH8Nw5Yn65WUvDgYhK5UwCyM8tuE92rOWISslDe9Vr9HnJA hd7Q1YM0pD+Ve0jrxmHn4BlpSp6By9uQhR91xO6chnGHDNnWZiPvrBW7pSqNj1m5wFfe /9rg== X-Gm-Message-State: ALKqPweXlG/tj7gbwGxcgc5oj5FuwOdrTuIDTbvZ/pA61R++q+99rzC1 DmuxiraPrd9Dv00+ymr+mlBApbh0GwydQA== X-Google-Smtp-Source: ADUXVKJ7VsFXhqnjENfX0TBuehQRaL2YNLLm6QYbrZFVfsWREipOS1tg3pQRMa+PvNK0VDUzchBgAA== X-Received: by 2002:a2e:5358:: with SMTP id t24-v6mr2161930ljd.129.1527685460817; Wed, 30 May 2018 06:04:20 -0700 (PDT) Return-Path: Received: from uffe-XPS-13-9360.ideon.se ([85.235.10.227]) by smtp.gmail.com with ESMTPSA id l10-v6sm7018050lja.62.2018.05.30.06.04.19 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 30 May 2018 06:04:19 -0700 (PDT) From: Ulf Hansson To: linux-mmc@vger.kernel.org, Ulf Hansson Subject: [PATCH 1/2] mmc: mxmmc: Use ifdef rather than __maybe_unused Date: Wed, 30 May 2018 15:04:16 +0200 Message-Id: <20180530130416.3779-1-ulf.hansson@linaro.org> X-Mailer: git-send-email 2.17.0 To be consistent with code in other mmc host drivers, convert to check the correct PM config #ifdef in favor of using __maybe_unused. Signed-off-by: Ulf Hansson --- drivers/mmc/host/mxcmmc.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) -- 2.17.0 diff --git a/drivers/mmc/host/mxcmmc.c b/drivers/mmc/host/mxcmmc.c index d62bf7efce13..75f781c11e89 100644 --- a/drivers/mmc/host/mxcmmc.c +++ b/drivers/mmc/host/mxcmmc.c @@ -1214,7 +1214,8 @@ static int mxcmci_remove(struct platform_device *pdev) return 0; } -static int __maybe_unused mxcmci_suspend(struct device *dev) +#ifdef CONFIG_PM_SLEEP +static int mxcmci_suspend(struct device *dev) { struct mmc_host *mmc = dev_get_drvdata(dev); struct mxcmci_host *host = mmc_priv(mmc); @@ -1224,7 +1225,7 @@ static int __maybe_unused mxcmci_suspend(struct device *dev) return 0; } -static int __maybe_unused mxcmci_resume(struct device *dev) +static int mxcmci_resume(struct device *dev) { struct mmc_host *mmc = dev_get_drvdata(dev); struct mxcmci_host *host = mmc_priv(mmc); @@ -1240,6 +1241,7 @@ static int __maybe_unused mxcmci_resume(struct device *dev) return ret; } +#endif static SIMPLE_DEV_PM_OPS(mxcmci_pm_ops, mxcmci_suspend, mxcmci_resume);