From patchwork Tue Dec 17 14:04:16 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 3361901 Return-Path: X-Original-To: patchwork-linux-mmc@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 2DA9BC0D4A for ; Tue, 17 Dec 2013 14:04:39 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 7F03D20384 for ; Tue, 17 Dec 2013 14:04:34 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D4F022038C for ; Tue, 17 Dec 2013 14:04:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753803Ab3LQOE3 (ORCPT ); Tue, 17 Dec 2013 09:04:29 -0500 Received: from mail-lb0-f182.google.com ([209.85.217.182]:45528 "EHLO mail-lb0-f182.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753798Ab3LQOE2 (ORCPT ); Tue, 17 Dec 2013 09:04:28 -0500 Received: by mail-lb0-f182.google.com with SMTP id l4so1439021lbv.41 for ; Tue, 17 Dec 2013 06:04:27 -0800 (PST) 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; bh=3cWnrzS8Vyky65qnj4UPXGa/I8a5ku8xc7bnrrm1haY=; b=DnOGCiMEyXmbwyJ89BpL0HB8ke+w4pTOR39zgM08axttCVlILye8TdfoCW1sJuVNKm IpfCNcHo5PYN5bu+HXOyI/vOK+ny7UOFxLQZ/5l0nl9cvYMWjc6f6ZC88/PTN62DRDgh kHJ8vZ41XdQ8HOHeUCnVAUp2elQ+/mEvbuacBFxPaI7FhpS1DuewS5YNsy3EXV0QdS4d FZB87hiT9TONiZjHj1IGj+Vgl3uQM0Blwa8WxD8/TcJXr8UP1r9GbSJxsVVJM8FzSQ1V GPF9TygjgghBkMqBvezt2JMIBQ9xz8SieWthzxQKuSTBd+9+6F5gmnpfpLWJz2mIkwzM HaTQ== X-Gm-Message-State: ALoCoQklJoAeD0iZVHt478hqaE6E3XyHgE9T3dYVZBxkRER81k/xqyb6IgSkRoomy0HXdeF1TDlr X-Received: by 10.152.180.104 with SMTP id dn8mr3386836lac.48.1387289067165; Tue, 17 Dec 2013 06:04:27 -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.25 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 17 Dec 2013 06:04:26 -0800 (PST) From: Ulf Hansson To: linux-mmc@vger.kernel.org, Chris Ball Cc: Ulf Hansson Subject: [PATCH 1/3] mmc: card: Remove host cap MMC_CAP2_SANITIZE Date: Tue, 17 Dec 2013 15:04:16 +0100 Message-Id: <1387289058-19755-1-git-send-email-ulf.hansson@linaro.org> X-Mailer: git-send-email 1.7.9.5 Sender: linux-mmc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mmc@vger.kernel.org X-Spam-Status: No, score=-7.4 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP There is no need for keeping a host cap for MMC_CAP2_SANITIZE, instead we just make the feature default available. Signed-off-by: Ulf Hansson --- drivers/mmc/card/block.c | 3 +-- include/linux/mmc/host.h | 1 - 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/drivers/mmc/card/block.c b/drivers/mmc/card/block.c index 7b5424f..c2187d5 100644 --- a/drivers/mmc/card/block.c +++ b/drivers/mmc/card/block.c @@ -415,8 +415,7 @@ static int ioctl_do_sanitize(struct mmc_card *card) { int err; - if (!(mmc_can_sanitize(card) && - (card->host->caps2 & MMC_CAP2_SANITIZE))) { + if (!mmc_can_sanitize(card)) { pr_warn("%s: %s - SANITIZE is not supported\n", mmc_hostname(card->host), __func__); err = -EOPNOTSUPP; diff --git a/include/linux/mmc/host.h b/include/linux/mmc/host.h index 99f5709..47fcc5d 100644 --- a/include/linux/mmc/host.h +++ b/include/linux/mmc/host.h @@ -281,7 +281,6 @@ struct mmc_host { #define MMC_CAP2_PACKED_CMD (MMC_CAP2_PACKED_RD | \ MMC_CAP2_PACKED_WR) #define MMC_CAP2_NO_PRESCAN_POWERUP (1 << 14) /* Don't power up before scan */ -#define MMC_CAP2_SANITIZE (1 << 15) /* Support Sanitize */ mmc_pm_flag_t pm_caps; /* supported pm features */