From patchwork Thu Nov 5 15:01:33 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 56056 Delivered-To: patches@linaro.org Received: by 10.112.61.134 with SMTP id p6csp455097lbr; Thu, 5 Nov 2015 07:01:54 -0800 (PST) X-Received: by 10.112.190.99 with SMTP id gp3mr3969097lbc.117.1446735714517; Thu, 05 Nov 2015 07:01:54 -0800 (PST) Return-Path: Received: from mail-lf0-x233.google.com (mail-lf0-x233.google.com. [2a00:1450:4010:c07::233]) by mx.google.com with ESMTPS id l4si4567375lbd.20.2015.11.05.07.01.54 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 05 Nov 2015 07:01:54 -0800 (PST) Received-SPF: pass (google.com: domain of ulf.hansson@linaro.org designates 2a00:1450:4010:c07::233 as permitted sender) client-ip=2a00:1450:4010:c07::233; Authentication-Results: mx.google.com; spf=pass (google.com: domain of ulf.hansson@linaro.org designates 2a00:1450:4010:c07::233 as permitted sender) smtp.mailfrom=ulf.hansson@linaro.org; dkim=pass header.i=@linaro_org.20150623.gappssmtp.com Received: by lfbn126 with SMTP id n126so59073972lfb.2 for ; Thu, 05 Nov 2015 07:01:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro_org.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=9VK+s67UmrDu3ONOsJ1Aj5xhg3Nh8PjWLPEMu0Hp9HM=; b=lamVv7WWWCdcyHae/azy0pDfXlVjHxqgFoEwZnghOdak0RfKlJnw1JNEZIe3Vd7OJF 19UIQSOD3e/8mKX/ZpCEcoAX+E+L888Y9PkhEl29LH+10ARL7ln0nYKsK9IkznI/uwJr AFcmm32/6zI+PN+bMAmldLV047VbqJe4nObMF5O582uO9lg/rQwCIJS69Ths0whYeVM6 FME++xRv2pKeJnr2bazF1SzBcmckj8vmvriTei0YW3z/F2WAPKGAvPr7fODfb3d5G7Wl RV7HFegmEEAQmZu+RMYOKk67jn3PDxmFp/v8L1HfnlWY+0LElfOyUGkvnVVz+Xxj5Phy MvfQ== 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=9VK+s67UmrDu3ONOsJ1Aj5xhg3Nh8PjWLPEMu0Hp9HM=; b=btXgG+1M/8hqLtaxv47UKwXjY9wT7vRTwmZMqCC9Gnh9qSIS2hXLrMG4cBZ2wrh9Ou oef/3nG10RvWmpUeQkRCDl9YGoO3RbL1bxIXbvz84Vc6a0PadkuL23gb8WoAj6ZjefUR tFsDbZCUaUqt7H/Y7NGaYG09qT0MVvr1bE4qCLFQs/ba/XqjJXogPAI68blUnycixmf/ VoKsqmbHBkzHF9YmNEGFDCT/v3jdADyn/YJPtS85SnmXzNK1LEjO4SvWlRFVk4kul2ur j1G/COsB+lbd4EFvmsqSmaYE2UMD3ZqjPf0EodgQH74eOg/W150wexUwttuXX/j+Qdiz E9bg== X-Gm-Message-State: ALoCoQm0qIhrpjSOX6KA4T/UGxowESJVc7Tv124qt4JJf1Ebgj14N1gl+zv1aYJLAfw20aYStsh3 X-Received: by 10.25.19.69 with SMTP id j66mr2305031lfi.25.1446735714184; Thu, 05 Nov 2015 07:01:54 -0800 (PST) Return-Path: Received: from uffe-Latitude-E6430s.ideon.se ([85.235.10.227]) by smtp.gmail.com with ESMTPSA id nb1sm1013941lbb.9.2015.11.05.07.01.53 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 05 Nov 2015 07:01:53 -0800 (PST) From: Ulf Hansson To: linux-mmc@vger.kernel.org, Ulf Hansson Cc: Chaotian Jing , addy ke , Jaehoon Chung , linux-pm@vger.kernel.org, Android Kernel Team Subject: [PATCH 2/2] mmc: core: Remove MMC_CAP_RUNTIME_RESUME as it's redundant Date: Thu, 5 Nov 2015 16:01:33 +0100 Message-Id: <1446735693-11542-2-git-send-email-ulf.hansson@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1446735693-11542-1-git-send-email-ulf.hansson@linaro.org> References: <1446735693-11542-1-git-send-email-ulf.hansson@linaro.org> Signed-off-by: Ulf Hansson --- drivers/mmc/host/dw_mmc-rockchip.c | 8 -------- drivers/mmc/host/mtk-sd.c | 1 - include/linux/mmc/host.h | 1 - 3 files changed, 10 deletions(-) -- 1.9.1 diff --git a/drivers/mmc/host/dw_mmc-rockchip.c b/drivers/mmc/host/dw_mmc-rockchip.c index 9becebe..d9c92f3 100644 --- a/drivers/mmc/host/dw_mmc-rockchip.c +++ b/drivers/mmc/host/dw_mmc-rockchip.c @@ -239,20 +239,12 @@ static int dw_mci_rockchip_init(struct dw_mci *host) return 0; } -/* Common capabilities of RK3288 SoC */ -static unsigned long dw_mci_rk3288_dwmmc_caps[4] = { - MMC_CAP_RUNTIME_RESUME, /* emmc */ - MMC_CAP_RUNTIME_RESUME, /* sdmmc */ - MMC_CAP_RUNTIME_RESUME, /* sdio0 */ - MMC_CAP_RUNTIME_RESUME, /* sdio1 */ -}; static const struct dw_mci_drv_data rk2928_drv_data = { .prepare_command = dw_mci_rockchip_prepare_command, .init = dw_mci_rockchip_init, }; static const struct dw_mci_drv_data rk3288_drv_data = { - .caps = dw_mci_rk3288_dwmmc_caps, .prepare_command = dw_mci_rockchip_prepare_command, .set_ios = dw_mci_rk3288_set_ios, .execute_tuning = dw_mci_rk3288_execute_tuning, diff --git a/drivers/mmc/host/mtk-sd.c b/drivers/mmc/host/mtk-sd.c index 39568cc..15fcf2d 100644 --- a/drivers/mmc/host/mtk-sd.c +++ b/drivers/mmc/host/mtk-sd.c @@ -1543,7 +1543,6 @@ static int msdc_drv_probe(struct platform_device *pdev) mmc->f_min = host->src_clk_freq / (4 * 255); mmc->caps |= MMC_CAP_ERASE | MMC_CAP_CMD23; - mmc->caps |= MMC_CAP_RUNTIME_RESUME; /* MMC core transfer sizes tunable parameters */ mmc->max_segs = MAX_BD_NUM; mmc->max_seg_size = BDMA_DESC_BUFLEN; diff --git a/include/linux/mmc/host.h b/include/linux/mmc/host.h index 8673ffe..9b04e71 100644 --- a/include/linux/mmc/host.h +++ b/include/linux/mmc/host.h @@ -259,7 +259,6 @@ struct mmc_host { #define MMC_CAP_UHS_SDR50 (1 << 17) /* Host supports UHS SDR50 mode */ #define MMC_CAP_UHS_SDR104 (1 << 18) /* Host supports UHS SDR104 mode */ #define MMC_CAP_UHS_DDR50 (1 << 19) /* Host supports UHS DDR50 mode */ -#define MMC_CAP_RUNTIME_RESUME (1 << 20) /* Resume at runtime_resume. */ #define MMC_CAP_DRIVER_TYPE_A (1 << 23) /* Host supports Driver Type A */ #define MMC_CAP_DRIVER_TYPE_C (1 << 24) /* Host supports Driver Type C */ #define MMC_CAP_DRIVER_TYPE_D (1 << 25) /* Host supports Driver Type D */