From patchwork Fri Nov 24 16:24:42 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 119622 Delivered-To: patch@linaro.org Received: by 10.140.22.164 with SMTP id 33csp2449917qgn; Fri, 24 Nov 2017 08:32:48 -0800 (PST) X-Google-Smtp-Source: AGs4zMbMIdJTgGlH4mY821GsT1LzGjf5+C1UmArLCeHl5O579GsUJ1YsZU1DrFQ7IwDeSfS8nJf5 X-Received: by 10.159.234.138 with SMTP id d10mr29647860plr.280.1511541168805; Fri, 24 Nov 2017 08:32:48 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1511541168; cv=none; d=google.com; s=arc-20160816; b=lIwufTjyeI+ivB7Xt2pdA1xFaXPAmSfWhAA81TZo+8u9cbXF1DUG95+UJPTJWeEbnn 0jTBKPXbN9Y9B6237626shCCKSDsDvimWqNDU5o2qd5oFCfRdUds0iKtK1+1tikltoFd YrCQK/qVQdqCBOmM6WdN8uyxSzbegYhojuJDsOu2YbXNrVi1c6xFkCz/AjFSebbRFqKW fqkHASOMAJnooyUjlk18fIHv1x256vguuMb7zA09mjmvkSMbWNlN39c8iHfuOa9JC5eW I9tze91lCoq3x3FIr83+r9SRLBwVQh8T9DeFRiisKTfwgxQZf3rM+3wP61pY3CN70mEJ 6BOw== 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=2RTbPG2ItqgPMQrEg9T+mEl11xyWEDboAkNQblfT+Ak=; b=uU1IJKF5r4m5/Y4TBRd8bxNyqNz1cU4YngTyOmLvVggpiVzsXWnpDBy+mYnDPFTNOy 5pOBuhqHkgYjh+pLqmkxQeWjoaqTs7ufxqjqPnP39q8ANkO3w6okvm+5yAGgjXKk0mf8 YyopNZxTCa4Zw1DsqXwEcQvnXVm7BgzSJudGwRSHS/oy+97cpAkERkg+ByjpokMYVClS Bjv9uxr9G5AFRSnQsi7TcardkwwA5GfGJg62dyVUytiAkv8h/BuNI5MAVQY1yZcY99Rg ENp8mRPky8Vsm7+1TdupczsUjJJvsykK2VcmsLjQhcgUlXiIs5OxVsx2JrHz+uzgaZ2e 9lyg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=wcQDp8SH; 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 3si18891264pli.734.2017.11.24.08.32.48; Fri, 24 Nov 2017 08:32:48 -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=wcQDp8SH; 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 S1753922AbdKXQcr (ORCPT + 28 others); Fri, 24 Nov 2017 11:32:47 -0500 Received: from conuserg-11.nifty.com ([210.131.2.78]:61400 "EHLO conuserg-11.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753533AbdKXQZ6 (ORCPT ); Fri, 24 Nov 2017 11:25:58 -0500 Received: from grover.sesame (FL1-125-199-20-195.osk.mesh.ad.jp [125.199.20.195]) (authenticated) by conuserg-11.nifty.com with ESMTP id vAOGP9Vr007100; Sat, 25 Nov 2017 01:25:15 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-11.nifty.com vAOGP9Vr007100 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1511540716; bh=2RTbPG2ItqgPMQrEg9T+mEl11xyWEDboAkNQblfT+Ak=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=wcQDp8SHrTMnazYCboEM1kv2AuPtc1Qwtz2dxlIr9eu3g0yRVr/UPPmKvV44+j8aX WhmbdUI+xOHtq41i7kSs6h/0vBgWYZrzoh0epy9ssI1633J/lZHPeffIoAjt3xC6V3 Im13WaslKtWb46aAHk6BJ3tmFSm/A4a5OVv6WMWMxu1PQyHlqqX6h19nbXt5FfIzXk u5uDhiiDhhMMFxoy/GvEa/lH2iwpH4jP+ghy4kaC/jJc4vCCtW9/aJ96IVSx0BlrHq qyS9g8DMuOqz8+e/uZTWvW6VhAmraa70Rx4BYI+6BwsbJ/Ixk17/1Jr/g4gw/OHXoB yd3SRiqbR8L1A== X-Nifty-SrcIP: [125.199.20.195] From: Masahiro Yamada To: linux-mmc@vger.kernel.org, Wolfram Sang Cc: Simon Horman , Yoshihiro Shimoda , linux-renesas-soc@vger.kernel.org, Masahiro Yamada , linux-kernel@vger.kernel.org, Ulf Hansson Subject: [PATCH v2 07/22] mmc: tmio, renesas_sdhi: set mmc_host_ops hooks directly Date: Sat, 25 Nov 2017 01:24:42 +0900 Message-Id: <1511540697-27387-8-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1511540697-27387-1-git-send-email-yamada.masahiro@socionext.com> References: <1511540697-27387-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 Drivers can set any mmc_host_ops hooks between tmio_mmc_host_alloc() and tmio_mmc_host_probe(). Remove duplicated hooks in tmio_mmc_host. Signed-off-by: Masahiro Yamada Reviewed-by: Wolfram Sang Tested-by: Wolfram Sang --- Changes in v2: - Rename "mmc_host_ops" to "ops" per Wolfram Sang drivers/mmc/host/renesas_sdhi_core.c | 4 ++-- drivers/mmc/host/tmio_mmc.h | 3 --- drivers/mmc/host/tmio_mmc_core.c | 4 ---- 3 files changed, 2 insertions(+), 9 deletions(-) -- 2.7.4 diff --git a/drivers/mmc/host/renesas_sdhi_core.c b/drivers/mmc/host/renesas_sdhi_core.c index 9baf4d1..267e2e0 100644 --- a/drivers/mmc/host/renesas_sdhi_core.c +++ b/drivers/mmc/host/renesas_sdhi_core.c @@ -549,8 +549,8 @@ int renesas_sdhi_probe(struct platform_device *pdev, /* SDR speeds are only available on Gen2+ */ if (mmc_data->flags & TMIO_MMC_MIN_RCAR2) { /* card_busy caused issues on r8a73a4 (pre-Gen2) CD-less SDHI */ - host->card_busy = renesas_sdhi_card_busy; - host->start_signal_voltage_switch = + host->ops.card_busy = renesas_sdhi_card_busy; + host->ops.start_signal_voltage_switch = renesas_sdhi_start_signal_voltage_switch; } diff --git a/drivers/mmc/host/tmio_mmc.h b/drivers/mmc/host/tmio_mmc.h index 4fdb51b..37409c5 100644 --- a/drivers/mmc/host/tmio_mmc.h +++ b/drivers/mmc/host/tmio_mmc.h @@ -186,9 +186,6 @@ struct tmio_mmc_host { void (*clk_disable)(struct tmio_mmc_host *host); int (*multi_io_quirk)(struct mmc_card *card, unsigned int direction, int blk_size); - int (*card_busy)(struct mmc_host *mmc); - int (*start_signal_voltage_switch)(struct mmc_host *mmc, - struct mmc_ios *ios); int (*write16_hook)(struct tmio_mmc_host *host, int addr); void (*hw_reset)(struct tmio_mmc_host *host); void (*prepare_tuning)(struct tmio_mmc_host *host, unsigned long tap); diff --git a/drivers/mmc/host/tmio_mmc_core.c b/drivers/mmc/host/tmio_mmc_core.c index af9ed6a..46f77c3 100644 --- a/drivers/mmc/host/tmio_mmc_core.c +++ b/drivers/mmc/host/tmio_mmc_core.c @@ -1205,10 +1205,6 @@ int tmio_mmc_host_probe(struct tmio_mmc_host *_host, if (ret < 0) return ret; - _host->ops.card_busy = _host->card_busy; - _host->ops.start_signal_voltage_switch = - _host->start_signal_voltage_switch; - mmc->caps |= MMC_CAP_4_BIT_DATA | pdata->capabilities; mmc->caps2 |= pdata->capabilities2; mmc->max_segs = pdata->max_segs ? : 32;