From patchwork Wed Jan 17 16:28:10 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 124854 Delivered-To: patch@linaro.org Received: by 10.46.62.1 with SMTP id l1csp107707lja; Wed, 17 Jan 2018 08:42:03 -0800 (PST) X-Google-Smtp-Source: ACJfBotgnzq4UCn0uRt/Ri9cqr0e3V9ZQVXyaSr1BgDrjzyDEKgDb8xOzkbmHDBQsJmD47PUwr7X X-Received: by 10.124.25.5 with SMTP id c5mr37089496plz.225.1516207323100; Wed, 17 Jan 2018 08:42:03 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1516207323; cv=none; d=google.com; s=arc-20160816; b=v5d/f1q4w5+qVo15Oo4uwG8bDo7Viv2tomoZtVXafKvhXY3zSn+zG7FPqBCmJ+Z8XG R/DSAdPEy4G7JtSAEkIIL8hdKdG19kIBW7FRQDf/XNGJpq97q6pdjV99gU+AlkbdeuEG kYPgB7RU3xDQUM/14f7ZULLsYpf6T+RzDEA+t3U/wuBXAq2ZAVnJljvO6q3F2oZmMTTp SSzCiefeZnQbn+3Uf9HxBy9wSZqRYu7sMpo6ArZHQtUlUvkNbcRdhbHFmLn9tcOEbljY pvkklja/P6wga4pkhRnebU9XejD+nvuMP52xvsA8AetKjuZap5kRFlOeIkpnDA8/aEv/ e6Cw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:dkim-filter :arc-authentication-results; bh=XD57mYxuSxd6HYj2QZ1odMq4C5kRYWfk150yxr1/TDI=; b=O73Wa/ha97ApZcYTEGrXqSriKvoEzVSaGeZQjYJ6SzOK3ET1GMc8fsiP1NT9RLdTZ+ /gfA69gnRcCbMMkBe2mN7vtliMhfEGLmnAWYgQQHoCXBKuka5TxLi5oIor7UcgW77wPy OVfznrLOZoOj65ULfEEV7hiRgJd3pt9KVko83IKmiGeW/Zdsr39y7TYzznC2QnNMHNZa 2FyRm2qX7dvBPGrft9nQIM4wvdHo8ZtGRyxW+kw6IjovudH2nui/8vfE4/ezSGsYYOG1 9qFXUJ6Vh1ycK3FgTijref2W6myXRsFZaxp0A7jF8CQHLthHVfIiv0otcp9AJWY1LkAm qBAg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=ncRoUacs; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id d25si4187059pge.729.2018.01.17.08.42.02; Wed, 17 Jan 2018 08:42:03 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=ncRoUacs; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754322AbeAQQlV (ORCPT + 28 others); Wed, 17 Jan 2018 11:41:21 -0500 Received: from conuserg-08.nifty.com ([210.131.2.75]:36691 "EHLO conuserg-08.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753845AbeAQQ3d (ORCPT ); Wed, 17 Jan 2018 11:29:33 -0500 Received: from grover.sesame (FL1-125-199-20-195.osk.mesh.ad.jp [125.199.20.195]) (authenticated) by conuserg-08.nifty.com with ESMTP id w0HGSIKu014790; Thu, 18 Jan 2018 01:28:27 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-08.nifty.com w0HGSIKu014790 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1516206508; bh=XD57mYxuSxd6HYj2QZ1odMq4C5kRYWfk150yxr1/TDI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ncRoUacsZLpJhENQV2QElE+k/du97CMD6jbOnyfQG8qKFcpLrkwNLwUzyFyuV83p1 Ne3cqlYQpnawtghs+obTcreCQOiAJ+FnrbrlNTx90FlJuHlF0m5ye7jpAab8u7uz9E 5ny+6QcKrWrkoF3cIIxSMhI+Af4JRv0LUMlBMVeu8P0+1o1Pve2zxuD7r+C8esUyOW B6Co6DgI2bqPMwCI4RP62FA0h5e+zgvnVMfbcqjcO0s6s91L9MCYB9Jszr7tJ2FNSf 09o5dlTRSsGF0kghhUM+zVK9F7WVPB8JepzcRJa7KsuOlyC3qrkn56xncXsZIR3TVJ VM2Y8ys6pV6VQ== X-Nifty-SrcIP: [125.199.20.195] From: Masahiro Yamada To: linux-mmc@vger.kernel.org, Wolfram Sang Cc: Ulf Magnusson , Geert Uytterhoeven , Simon Horman , Yoshihiro Shimoda , linux-renesas-soc@vger.kernel.org, Masahiro Yamada , Lee Jones , linux-kernel@vger.kernel.org, Ulf Hansson Subject: [PATCH v3 10/16] mmc: tmio: remove TMIO_MMC_WRPROTECT_DISABLE Date: Thu, 18 Jan 2018 01:28:10 +0900 Message-Id: <1516206496-16612-11-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1516206496-16612-1-git-send-email-yamada.masahiro@socionext.com> References: <1516206496-16612-1-git-send-email-yamada.masahiro@socionext.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The use of this flag has been replaced with MMC_CAP2_NO_WRITE_PROTECT. No platform defines this flag any more. Remove. Signed-off-by: Masahiro Yamada --- Changes in v3: - newly added Changes in v2: None drivers/mmc/host/tmio_mmc_core.c | 5 ++--- include/linux/mfd/tmio.h | 1 - 2 files changed, 2 insertions(+), 4 deletions(-) -- 2.7.4 diff --git a/drivers/mmc/host/tmio_mmc_core.c b/drivers/mmc/host/tmio_mmc_core.c index bdbff2d..7ad3433c 100644 --- a/drivers/mmc/host/tmio_mmc_core.c +++ b/drivers/mmc/host/tmio_mmc_core.c @@ -1075,10 +1075,9 @@ static void tmio_mmc_set_ios(struct mmc_host *mmc, struct mmc_ios *ios) static int tmio_mmc_get_ro(struct mmc_host *mmc) { struct tmio_mmc_host *host = mmc_priv(mmc); - struct tmio_mmc_data *pdata = host->pdata; - return !((pdata->flags & TMIO_MMC_WRPROTECT_DISABLE) || - (sd_ctrl_read16_and_16_as_32(host, CTL_STATUS) & TMIO_STAT_WRPROTECT)); + return !(sd_ctrl_read16_and_16_as_32(host, CTL_STATUS) & + TMIO_STAT_WRPROTECT); } static int tmio_multi_io_quirk(struct mmc_card *card, diff --git a/include/linux/mfd/tmio.h b/include/linux/mfd/tmio.h index 396a103c..91f9221 100644 --- a/include/linux/mfd/tmio.h +++ b/include/linux/mfd/tmio.h @@ -36,7 +36,6 @@ } while (0) /* tmio MMC platform flags */ -#define TMIO_MMC_WRPROTECT_DISABLE BIT(0) /* * Some controllers can support a 2-byte block size when the bus width * is configured in 4-bit mode.