From patchwork Tue Dec 17 14:04:18 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 22575 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ob0-f200.google.com (mail-ob0-f200.google.com [209.85.214.200]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 6FAE123FC6 for ; Tue, 17 Dec 2013 14:04:33 +0000 (UTC) Received: by mail-ob0-f200.google.com with SMTP id wm4sf22201856obc.11 for ; Tue, 17 Dec 2013 06:04:33 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :list-post:list-help:list-archive:list-unsubscribe; bh=125lUzqASQ87n+LzElQYv9jFQ201nHMExFMo0dNHP2I=; b=B3ETBud4HuP4/cVArC+BDNMNLmxFmwtTN9V/F3XKoIUiIkwA/+Au/BBX/NFLALwgBp x2UoGCl4Ect8ISKRrLt8VwroCN+vpJ+AwEPAEQJhJPwyCVV3smxpv7zXs74SsW9pO0qs nZtvyCusg/spaKjtiA36fRywJalkjNS0OdgGypz/VV/lcE9w75qh4zubKYWU4Z3G04bo Ein4mJUD7EQAoPTM94xgmImFsbdsnz6RqmFA0fL5/ouKgrn49W68Mo2umOa8kopiLPry ISH46h5vHB80nbQcADgF1EuGzj4PTOu4aQM6WAc1/38v+tR5O21Qg9v09e80xMwgB3GW ln0A== X-Gm-Message-State: ALoCoQmNCjW6WXK3lswbkAxrHwoLJ2ol9fvfnKNCAjzqFmBAnBgdKieTPakx56QaevHw20cYyt4c X-Received: by 10.43.44.136 with SMTP id ug8mr7685624icb.17.1387289072992; Tue, 17 Dec 2013 06:04:32 -0800 (PST) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.48.105 with SMTP id k9ls2466170qen.96.gmail; Tue, 17 Dec 2013 06:04:32 -0800 (PST) X-Received: by 10.58.207.76 with SMTP id lu12mr6478741vec.30.1387289072420; Tue, 17 Dec 2013 06:04:32 -0800 (PST) Received: from mail-vb0-f43.google.com (mail-vb0-f43.google.com [209.85.212.43]) by mx.google.com with ESMTPS id sl9si4933818vdc.99.2013.12.17.06.04.32 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 17 Dec 2013 06:04:32 -0800 (PST) Received-SPF: neutral (google.com: 209.85.212.43 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.212.43; Received: by mail-vb0-f43.google.com with SMTP id p6so4162946vbe.30 for ; Tue, 17 Dec 2013 06:04:32 -0800 (PST) X-Received: by 10.220.66.200 with SMTP id o8mr5825823vci.7.1387289072091; Tue, 17 Dec 2013 06:04:32 -0800 (PST) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.220.174.196 with SMTP id u4csp71067vcz; Tue, 17 Dec 2013 06:04:31 -0800 (PST) X-Received: by 10.152.29.202 with SMTP id m10mr193953lah.23.1387289071061; Tue, 17 Dec 2013 06:04:31 -0800 (PST) Received: from mail-la0-f45.google.com (mail-la0-f45.google.com [209.85.215.45]) by mx.google.com with ESMTPS id ax2si894904lbc.45.2013.12.17.06.04.30 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 17 Dec 2013 06:04:30 -0800 (PST) Received-SPF: neutral (google.com: 209.85.215.45 is neither permitted nor denied by best guess record for domain of ulf.hansson@linaro.org) client-ip=209.85.215.45; Received: by mail-la0-f45.google.com with SMTP id eh20so3316287lab.32 for ; Tue, 17 Dec 2013 06:04:30 -0800 (PST) X-Received: by 10.112.13.169 with SMTP id i9mr1319338lbc.73.1387289070438; Tue, 17 Dec 2013 06:04:30 -0800 (PST) Received: from linaro-ulf.lan (90-231-160-185-no158.tbcn.telia.com. [90.231.160.185]) by mx.google.com with ESMTPSA id bl6sm1684306lbb.5.2013.12.17.06.04.28 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 17 Dec 2013 06:04:29 -0800 (PST) From: Ulf Hansson To: linux-mmc@vger.kernel.org, Chris Ball Cc: Ulf Hansson Subject: [PATCH 3/3] mmc: core: Remove support for MMC_CAP2_NO_SLEEP_CMD Date: Tue, 17 Dec 2013 15:04:18 +0100 Message-Id: <1387289058-19755-3-git-send-email-ulf.hansson@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1387289058-19755-1-git-send-email-ulf.hansson@linaro.org> References: <1387289058-19755-1-git-send-email-ulf.hansson@linaro.org> X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: ulf.hansson@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.212.43 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , There are no active users of this host capability. The primary reason for adding this cap was due to a bug in ux500 boot loader code, which is not a relevant issue any more. So, let's remove it. Signed-off-by: Ulf Hansson --- drivers/mmc/core/mmc.c | 3 --- include/linux/mmc/host.h | 1 - 2 files changed, 4 deletions(-) diff --git a/drivers/mmc/core/mmc.c b/drivers/mmc/core/mmc.c index 98e9eb0..52b84cb 100644 --- a/drivers/mmc/core/mmc.c +++ b/drivers/mmc/core/mmc.c @@ -1358,9 +1358,6 @@ static int mmc_sleep(struct mmc_host *host) struct mmc_card *card = host->card; int err; - if (host->caps2 & MMC_CAP2_NO_SLEEP_CMD) - return 0; - err = mmc_deselect_cards(host); if (err) return err; diff --git a/include/linux/mmc/host.h b/include/linux/mmc/host.h index a76993c..4ff994c 100644 --- a/include/linux/mmc/host.h +++ b/include/linux/mmc/host.h @@ -267,7 +267,6 @@ struct mmc_host { #define MMC_CAP2_CACHE_CTRL (1 << 1) /* Allow cache control */ #define MMC_CAP2_FULL_PWR_CYCLE (1 << 2) /* Can do full power cycle */ #define MMC_CAP2_NO_MULTI_READ (1 << 3) /* Multiblock reads don't work */ -#define MMC_CAP2_NO_SLEEP_CMD (1 << 4) /* Don't allow sleep command */ #define MMC_CAP2_HS200_1_8V_SDR (1 << 5) /* can support */ #define MMC_CAP2_HS200_1_2V_SDR (1 << 6) /* can support */ #define MMC_CAP2_HS200 (MMC_CAP2_HS200_1_8V_SDR | \