From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.3 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id B6878C10F29 for ; Mon, 9 Mar 2020 07:21:21 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 96C7A2072A for ; Mon, 9 Mar 2020 07:21:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726389AbgCIHVV (ORCPT ); Mon, 9 Mar 2020 03:21:21 -0400 Received: from mga14.intel.com ([192.55.52.115]:36251 "EHLO mga14.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725796AbgCIHVV (ORCPT ); Mon, 9 Mar 2020 03:21:21 -0400 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by fmsmga103.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 09 Mar 2020 00:21:20 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.70,532,1574150400"; d="scan'208";a="235518522" Received: from ahunter-desktop.fi.intel.com (HELO [10.237.72.167]) ([10.237.72.167]) by fmsmga008.fm.intel.com with ESMTP; 09 Mar 2020 00:21:17 -0700 Subject: Re: [PATCH v2 06/11] mmc: sdhci: xenon: Use sdhci_set_power_and_voltage() To: Nicolas Saenz Julienne , linux-kernel@vger.kernel.org, Hu Ziji Cc: phil@raspberrypi.com, linux-mmc@vger.kernel.org, linux-arm-kernel@lists.infradead.org, f.fainelli@gmail.com, stefan.wahren@i2se.com, bcm-kernel-feedback-list@broadcom.com, linux-rpi-kernel@lists.infradead.org, Ulf Hansson References: <20200306174413.20634-1-nsaenzjulienne@suse.de> <20200306174413.20634-7-nsaenzjulienne@suse.de> From: Adrian Hunter Organization: Intel Finland Oy, Registered Address: PL 281, 00181 Helsinki, Business Identity Code: 0357606 - 4, Domiciled in Helsinki Message-ID: <4e74203a-5444-2b7a-3555-9615cc45aaae@intel.com> Date: Mon, 9 Mar 2020 09:20:32 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.5.0 MIME-Version: 1.0 In-Reply-To: <20200306174413.20634-7-nsaenzjulienne@suse.de> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit Sender: linux-mmc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mmc@vger.kernel.org On 6/03/20 7:44 pm, Nicolas Saenz Julienne wrote: > The sdhci core provides a helper function with the same functionality as > this controller's set_power() callback. Use it instead. > > Signed-off-by: Nicolas Saenz Julienne > --- > drivers/mmc/host/sdhci-xenon.c | 20 +------------------- > 1 file changed, 1 insertion(+), 19 deletions(-) > > diff --git a/drivers/mmc/host/sdhci-xenon.c b/drivers/mmc/host/sdhci-xenon.c > index 1dea1ba66f7b..1e9a7a76f2ba 100644 > --- a/drivers/mmc/host/sdhci-xenon.c > +++ b/drivers/mmc/host/sdhci-xenon.c > @@ -213,24 +213,6 @@ static void xenon_set_uhs_signaling(struct sdhci_host *host, > sdhci_writew(host, ctrl_2, SDHCI_HOST_CONTROL2); > } > > -static void xenon_set_power(struct sdhci_host *host, unsigned char mode, > - unsigned short vdd) > -{ > - struct mmc_host *mmc = host->mmc; > - u8 pwr = host->pwr; > - > - sdhci_set_power_noreg(host, mode, vdd); > - > - if (host->pwr == pwr) > - return; > - > - if (host->pwr == 0) > - vdd = 0; > - > - if (!IS_ERR(mmc->supply.vmmc)) > - mmc_regulator_set_ocr(mmc, mmc->supply.vmmc, vdd); > -} This code is different. The commit message should explain why it is equivalent. Has it been tested? > - > static void xenon_voltage_switch(struct sdhci_host *host) > { > /* Wait for 5ms after set 1.8V signal enable bit */ > @@ -240,7 +222,7 @@ static void xenon_voltage_switch(struct sdhci_host *host) > static const struct sdhci_ops sdhci_xenon_ops = { > .voltage_switch = xenon_voltage_switch, > .set_clock = sdhci_set_clock, > - .set_power = xenon_set_power, > + .set_power = sdhci_set_power_and_bus_voltage, > .set_bus_width = sdhci_set_bus_width, > .reset = xenon_reset, > .set_uhs_signaling = xenon_set_uhs_signaling, >