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: 22573 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-vc0-f200.google.com (mail-vc0-f200.google.com [209.85.220.200]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id BBC1E23FC6 for ; Tue, 17 Dec 2013 14:04:30 +0000 (UTC) Received: by mail-vc0-f200.google.com with SMTP id hu19sf11390023vcb.7 for ; Tue, 17 Dec 2013 06:04:29 -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:x-original-sender:x-original-authentication-results :precedence:mailing-list:list-id:list-post:list-help:list-archive :list-unsubscribe; bh=3cWnrzS8Vyky65qnj4UPXGa/I8a5ku8xc7bnrrm1haY=; b=SGqw4kpzPAtIoxPXpPDYb1kX/1rONk8eiQIdIT9VyCLVRim8YZNHthyuyYY8JHhW8W gEYwh3wxjzpWcYidrVQka4gVLSMYnVaeIauocneLGay/0ER/h7sr9p1CP4eZRxD6UhWF vDqZKrJBiASzCliWqeV8HG1mONVowB43d6LSbuSVw/tjWKym/K6H4SrqKHgIzk3WhCuH 4bXH9/gDWT8/Ney7PjsDlH/acro2Bn+g/zfS5ei0VtwIBj1KaG/DmxLjautTWRhuJjo1 qLNx9PNSPuGU67OPEGvHP+4VesXfuIZ9aSUvE0oUapmcoFSK1lM//+Y0NN7DN4oYRo68 E6yQ== X-Gm-Message-State: ALoCoQm2jHzTRrWI54r7YuNPLEJ6txF+EQqmpn0FLaGcjv8ah2B7X8Q4KJgtnvVY7fZdK7B5pamX X-Received: by 10.224.50.69 with SMTP id y5mr8138269qaf.5.1387289069672; Tue, 17 Dec 2013 06:04:29 -0800 (PST) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.97.201 with SMTP id ec9ls2462684qeb.60.gmail; Tue, 17 Dec 2013 06:04:29 -0800 (PST) X-Received: by 10.52.31.227 with SMTP id d3mr5356012vdi.38.1387289069479; Tue, 17 Dec 2013 06:04:29 -0800 (PST) Received: from mail-ve0-f175.google.com (mail-ve0-f175.google.com [209.85.128.175]) by mx.google.com with ESMTPS id uh5si4950554vcb.52.2013.12.17.06.04.29 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 17 Dec 2013 06:04:29 -0800 (PST) Received-SPF: neutral (google.com: 209.85.128.175 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.128.175; Received: by mail-ve0-f175.google.com with SMTP id jx11so4301137veb.20 for ; Tue, 17 Dec 2013 06:04:29 -0800 (PST) X-Received: by 10.221.16.200 with SMTP id pz8mr661258vcb.53.1387289069387; Tue, 17 Dec 2013 06:04:29 -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 u4csp71061vcz; Tue, 17 Dec 2013 06:04:28 -0800 (PST) X-Received: by 10.152.228.168 with SMTP id sj8mr3266790lac.59.1387289067891; Tue, 17 Dec 2013 06:04:27 -0800 (PST) Received: from mail-la0-f50.google.com (mail-la0-f50.google.com [209.85.215.50]) by mx.google.com with ESMTPS id k8si7758575lag.124.2013.12.17.06.04.27 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 17 Dec 2013 06:04:27 -0800 (PST) Received-SPF: neutral (google.com: 209.85.215.50 is neither permitted nor denied by best guess record for domain of ulf.hansson@linaro.org) client-ip=209.85.215.50; Received: by mail-la0-f50.google.com with SMTP id el20so3240948lab.37 for ; Tue, 17 Dec 2013 06:04:27 -0800 (PST) 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 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.128.175 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 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 */