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 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 17DB9C433EF for ; Thu, 14 Oct 2021 09:58:46 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id ED3D76101E for ; Thu, 14 Oct 2021 09:58:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230255AbhJNKAr (ORCPT ); Thu, 14 Oct 2021 06:00:47 -0400 Received: from mga07.intel.com ([134.134.136.100]:48155 "EHLO mga07.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230202AbhJNKAn (ORCPT ); Thu, 14 Oct 2021 06:00:43 -0400 X-IronPort-AV: E=McAfee;i="6200,9189,10136"; a="291133764" X-IronPort-AV: E=Sophos;i="5.85,372,1624345200"; d="scan'208";a="291133764" Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Oct 2021 02:58:39 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.85,372,1624345200"; d="scan'208";a="571191739" Received: from ahunter-desktop.fi.intel.com (HELO [10.237.72.76]) ([10.237.72.76]) by fmsmga002.fm.intel.com with ESMTP; 14 Oct 2021 02:58:37 -0700 Subject: Re: [PATCH v2 2/6] mmc: sdhci: Deduplicate sdhci_get_cd_nogpio() To: Andy Shevchenko , Ulf Hansson , Eric Biggers , Raul E Rangel , linux-kernel@vger.kernel.org, linux-mmc@vger.kernel.org References: <20211013201723.52212-1-andriy.shevchenko@linux.intel.com> <20211013201723.52212-3-andriy.shevchenko@linux.intel.com> From: Adrian Hunter Organization: Intel Finland Oy, Registered Address: PL 281, 00181 Helsinki, Business Identity Code: 0357606 - 4, Domiciled in Helsinki Message-ID: <16c26216-3e1c-3403-9469-23b6c80379e8@intel.com> Date: Thu, 14 Oct 2021 12:58:36 +0300 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Firefox/78.0 Thunderbird/78.13.0 MIME-Version: 1.0 In-Reply-To: <20211013201723.52212-3-andriy.shevchenko@linux.intel.com> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 13/10/2021 23:17, Andy Shevchenko wrote: > The analogue of the sdhci_get_cd_nogpio() is used in the sdhci-pci-core > and sdhci-acpi modules. Deduplicate it by moving to sdhci and exporting. > > Signed-off-by: Andy Shevchenko Acked-by: Adrian Hunter > --- > drivers/mmc/host/sdhci-acpi.c | 14 +------------- > drivers/mmc/host/sdhci-pci-core.c | 18 ------------------ > drivers/mmc/host/sdhci.c | 19 +++++++++++++++++++ > drivers/mmc/host/sdhci.h | 1 + > 4 files changed, 21 insertions(+), 31 deletions(-) > > diff --git a/drivers/mmc/host/sdhci-acpi.c b/drivers/mmc/host/sdhci-acpi.c > index 8fe65f172a61..f1ef0d28b0dd 100644 > --- a/drivers/mmc/host/sdhci-acpi.c > +++ b/drivers/mmc/host/sdhci-acpi.c > @@ -362,23 +362,11 @@ static inline bool sdhci_acpi_no_fixup_child_power(struct acpi_device *adev) > static int bxt_get_cd(struct mmc_host *mmc) > { > int gpio_cd = mmc_gpio_get_cd(mmc); > - struct sdhci_host *host = mmc_priv(mmc); > - unsigned long flags; > - int ret = 0; > > if (!gpio_cd) > return 0; > > - spin_lock_irqsave(&host->lock, flags); > - > - if (host->flags & SDHCI_DEVICE_DEAD) > - goto out; > - > - ret = !!(sdhci_readl(host, SDHCI_PRESENT_STATE) & SDHCI_CARD_PRESENT); > -out: > - spin_unlock_irqrestore(&host->lock, flags); > - > - return ret; > + return sdhci_get_cd_nogpio(mmc); > } > > static int intel_probe_slot(struct platform_device *pdev, struct acpi_device *adev) > diff --git a/drivers/mmc/host/sdhci-pci-core.c b/drivers/mmc/host/sdhci-pci-core.c > index d0f2edfe296c..19e13dfae593 100644 > --- a/drivers/mmc/host/sdhci-pci-core.c > +++ b/drivers/mmc/host/sdhci-pci-core.c > @@ -616,24 +616,6 @@ static int intel_select_drive_strength(struct mmc_card *card, > return intel_host->drv_strength; > } > > -static int sdhci_get_cd_nogpio(struct mmc_host *mmc) > -{ > - struct sdhci_host *host = mmc_priv(mmc); > - unsigned long flags; > - int ret = 0; > - > - spin_lock_irqsave(&host->lock, flags); > - > - if (host->flags & SDHCI_DEVICE_DEAD) > - goto out; > - > - ret = !!(sdhci_readl(host, SDHCI_PRESENT_STATE) & SDHCI_CARD_PRESENT); > -out: > - spin_unlock_irqrestore(&host->lock, flags); > - > - return ret; > -} > - > static int bxt_get_cd(struct mmc_host *mmc) > { > int gpio_cd = mmc_gpio_get_cd(mmc); > diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c > index 357b365bf0ec..1f4b052f6f27 100644 > --- a/drivers/mmc/host/sdhci.c > +++ b/drivers/mmc/host/sdhci.c > @@ -2419,6 +2419,25 @@ static int sdhci_get_cd(struct mmc_host *mmc) > return !!(sdhci_readl(host, SDHCI_PRESENT_STATE) & SDHCI_CARD_PRESENT); > } > > +int sdhci_get_cd_nogpio(struct mmc_host *mmc) > +{ > + struct sdhci_host *host = mmc_priv(mmc); > + unsigned long flags; > + int ret = 0; > + > + spin_lock_irqsave(&host->lock, flags); > + > + if (host->flags & SDHCI_DEVICE_DEAD) > + goto out; > + > + ret = !!(sdhci_readl(host, SDHCI_PRESENT_STATE) & SDHCI_CARD_PRESENT); > +out: > + spin_unlock_irqrestore(&host->lock, flags); > + > + return ret; > +} > +EXPORT_SYMBOL_GPL(sdhci_get_cd_nogpio); > + > static int sdhci_check_ro(struct sdhci_host *host) > { > unsigned long flags; > diff --git a/drivers/mmc/host/sdhci.h b/drivers/mmc/host/sdhci.h > index e8d04e42a5af..c593af479832 100644 > --- a/drivers/mmc/host/sdhci.h > +++ b/drivers/mmc/host/sdhci.h > @@ -775,6 +775,7 @@ void sdhci_set_power_and_bus_voltage(struct sdhci_host *host, > unsigned short vdd); > void sdhci_set_power_noreg(struct sdhci_host *host, unsigned char mode, > unsigned short vdd); > +int sdhci_get_cd_nogpio(struct mmc_host *mmc); > void sdhci_request(struct mmc_host *mmc, struct mmc_request *mrq); > int sdhci_request_atomic(struct mmc_host *mmc, struct mmc_request *mrq); > void sdhci_set_bus_width(struct sdhci_host *host, int width); >