From: adrian.hunter@intel•com (Adrian Hunter)
To: linux-arm-kernel@lists•infradead.org
Subject: [PATCH 02/23] mmc: sdhci: move sdhci_get_cd() forward to avoid declaration
Date: Wed, 27 Apr 2016 23:26:27 +0300 [thread overview]
Message-ID: <57212073.7090006@intel.com> (raw)
In-Reply-To: <CAA+hA=R_8KfwZutxYp4tBx0bkSrJYsUcR7c1fWjAVFUxqwpByw@mail.gmail.com>
On 24/04/2016 12:17 p.m., Dong Aisheng wrote:
> On Fri, Apr 22, 2016 at 6:27 PM, Adrian Hunter <adrian.hunter@intel•com> wrote:
>> On 15/04/16 20:29, Dong Aisheng wrote:
>>> Move sdhci_get_cd() to avoid needing to declare this function
>>> before use.
>>
>> In fact, we shouldn't be calling host functions directly. i.e. the call
>> should be host->mmc->ops->get_cd().
>>
>> However the caller sdhci_do_reset() is called under spinlock so it should
>> not be calling ->get_cd at all.
>>
>> What that means is that we really need to get rid of
>> SDHCI_QUIRK_NO_CARD_NO_RESET, after which this patch wouldn't be needed, so
>> let's leave it for now.
>>
>
> Yes, i agree we need get rid of SDHCI_QUIRK_NO_CARD_NO_RESET.
> However, after that, we still need to remove the sdhci_get_cd
> pre-declaration, right?
Sure
>
> Regards
> Dong Aisheng
>
>>>
>>> Signed-off-by: Dong Aisheng <aisheng.dong@nxp•com>
>>> ---
>>> drivers/mmc/host/sdhci.c | 55 ++++++++++++++++++++++++------------------------
>>> 1 file changed, 27 insertions(+), 28 deletions(-)
>>>
>>> diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c
>>> index be52a3a..839aa4c 100644
>>> --- a/drivers/mmc/host/sdhci.c
>>> +++ b/drivers/mmc/host/sdhci.c
>>> @@ -53,7 +53,6 @@ static void sdhci_finish_data(struct sdhci_host *);
>>> static void sdhci_finish_command(struct sdhci_host *);
>>> static int sdhci_execute_tuning(struct mmc_host *mmc, u32 opcode);
>>> static void sdhci_enable_preset_value(struct sdhci_host *host, bool enable);
>>> -static int sdhci_get_cd(struct mmc_host *mmc);
>>>
>>> #ifdef CONFIG_PM
>>> static void sdhci_runtime_pm_bus_on(struct sdhci_host *host);
>>> @@ -161,6 +160,33 @@ static void sdhci_disable_card_detection(struct sdhci_host *host)
>>> sdhci_set_card_detection(host, false);
>>> }
>>>
>>> +static int sdhci_get_cd(struct mmc_host *mmc)
>>> +{
>>> + struct sdhci_host *host = mmc_priv(mmc);
>>> + int gpio_cd = mmc_gpio_get_cd(mmc);
>>> +
>>> + if (host->flags & SDHCI_DEVICE_DEAD)
>>> + return 0;
>>> +
>>> + /* If nonremovable, assume that the card is always present. */
>>> + if (host->mmc->caps & MMC_CAP_NONREMOVABLE)
>>> + return 1;
>>> +
>>> + /*
>>> + * Try slot gpio detect, if defined it take precedence
>>> + * over build in controller functionality
>>> + */
>>> + if (!IS_ERR_VALUE(gpio_cd))
>>> + return !!gpio_cd;
>>> +
>>> + /* If polling, assume that the card is always present. */
>>> + if (host->quirks & SDHCI_QUIRK_BROKEN_CARD_DETECTION)
>>> + return 1;
>>> +
>>> + /* Host native card detect */
>>> + return !!(sdhci_readl(host, SDHCI_PRESENT_STATE) & SDHCI_CARD_PRESENT);
>>> +}
>>> +
>>> void sdhci_reset(struct sdhci_host *host, u8 mask)
>>> {
>>> unsigned long timeout;
>>> @@ -1551,33 +1577,6 @@ static void sdhci_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)
>>> spin_unlock_irqrestore(&host->lock, flags);
>>> }
>>>
>>> -static int sdhci_get_cd(struct mmc_host *mmc)
>>> -{
>>> - struct sdhci_host *host = mmc_priv(mmc);
>>> - int gpio_cd = mmc_gpio_get_cd(mmc);
>>> -
>>> - if (host->flags & SDHCI_DEVICE_DEAD)
>>> - return 0;
>>> -
>>> - /* If nonremovable, assume that the card is always present. */
>>> - if (host->mmc->caps & MMC_CAP_NONREMOVABLE)
>>> - return 1;
>>> -
>>> - /*
>>> - * Try slot gpio detect, if defined it take precedence
>>> - * over build in controller functionality
>>> - */
>>> - if (!IS_ERR_VALUE(gpio_cd))
>>> - return !!gpio_cd;
>>> -
>>> - /* If polling, assume that the card is always present. */
>>> - if (host->quirks & SDHCI_QUIRK_BROKEN_CARD_DETECTION)
>>> - return 1;
>>> -
>>> - /* Host native card detect */
>>> - return !!(sdhci_readl(host, SDHCI_PRESENT_STATE) & SDHCI_CARD_PRESENT);
>>> -}
>>> -
>>> static int sdhci_check_ro(struct sdhci_host *host)
>>> {
>>> unsigned long flags;
>>>
>>
next prev parent reply other threads:[~2016-04-27 20:26 UTC|newest]
Thread overview: 85+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-04-15 17:29 [PATCH 00/23] a few sdhci/imx clean up and fix patches Dong Aisheng
2016-04-15 17:29 ` [PATCH 01/23] mmc: sdhci: removed unneeded function wrappers Dong Aisheng
2016-04-22 10:27 ` Adrian Hunter
2016-05-10 6:32 ` Adrian Hunter
2016-05-10 9:46 ` Ulf Hansson
2016-04-15 17:29 ` [PATCH 02/23] mmc: sdhci: move sdhci_get_cd() forward to avoid declaration Dong Aisheng
2016-04-22 10:27 ` Adrian Hunter
2016-04-24 9:17 ` Dong Aisheng
2016-04-27 20:26 ` Adrian Hunter [this message]
2016-04-15 17:29 ` [PATCH 03/23] mmc: core: fix a comment typo Dong Aisheng
2016-04-22 10:28 ` Adrian Hunter
2016-04-15 17:29 ` [PATCH 04/23] mmc: sdhci: re-factor sdhci_start_signal_voltage() Dong Aisheng
2016-04-22 11:43 ` Adrian Hunter
2016-04-24 9:14 ` Dong Aisheng
2016-04-27 20:26 ` Adrian Hunter
2016-04-28 3:09 ` Dong Aisheng
2016-04-28 6:39 ` Adrian Hunter
2016-04-28 7:15 ` Jaehoon Chung
2016-04-28 7:44 ` Adrian Hunter
2016-04-28 8:30 ` Jaehoon Chung
2016-04-28 14:09 ` Dong Aisheng
2016-04-28 23:06 ` Jaehoon Chung
2016-04-28 13:14 ` Dong Aisheng
2016-04-28 13:36 ` Adrian Hunter
2016-04-28 14:28 ` Dong Aisheng
2016-04-29 7:32 ` Adrian Hunter
2016-04-29 7:57 ` Dong Aisheng
2016-04-15 17:29 ` [PATCH 05/23] mmc: core: mmc_regulator_set_vqmmc not return error if vqmmc/vmmc not exist Dong Aisheng
2016-04-15 17:29 ` [PATCH 06/23] mmc: sdhci: using common mmc_regulator_set_vqmmc() Dong Aisheng
2016-04-22 11:48 ` Adrian Hunter
2016-04-24 9:25 ` Dong Aisheng
2016-04-15 17:29 ` [PATCH 07/23] mmc: sdhci: check SDHCI_QUIRK2_NO_1_8_V when do voltage switch Dong Aisheng
2016-04-22 12:30 ` Adrian Hunter
2016-04-24 9:56 ` Dong Aisheng
2016-04-27 20:27 ` Adrian Hunter
2016-04-28 13:24 ` Dong Aisheng
2016-04-15 17:29 ` [PATCH 08/23] mmc: sdhci: rename quirk SDHCI_QUIRK_MULTIBLOCK_READ_ACMD12 Dong Aisheng
2016-04-22 12:33 ` Adrian Hunter
2016-04-24 10:00 ` Dong Aisheng
2016-04-15 17:29 ` [PATCH 09/23] mmc: sdhci: fix incorrect get data interrupt during no data transfer Dong Aisheng
2016-05-10 6:51 ` Adrian Hunter
2016-05-17 4:31 ` Ritesh Harjani
2016-05-17 5:58 ` Adrian Hunter
2016-05-26 14:59 ` Ritesh Harjani
2016-05-26 11:41 ` Dong Aisheng
2016-05-26 11:59 ` Adrian Hunter
2016-04-15 17:29 ` [PATCH 10/23] mmc: core: disable auto retune during card detection process Dong Aisheng
2016-04-22 12:48 ` Adrian Hunter
2016-04-24 10:47 ` Dong Aisheng
2016-04-28 7:04 ` Adrian Hunter
2016-04-28 13:22 ` Dong Aisheng
2016-04-29 6:54 ` Adrian Hunter
2016-04-29 7:42 ` Dong Aisheng
2016-05-10 6:55 ` Adrian Hunter
2016-05-31 10:18 ` Dong Aisheng
2016-04-15 17:29 ` [PATCH 11/23] mmc: sdhci-esdhci-imx: remove SDHCI_QUIRK_BROKEN_TIMEOUT_VAL Dong Aisheng
2016-05-10 9:30 ` Adrian Hunter
2016-04-15 17:29 ` [PATCH 12/23] mmc: sdhci-esdhc-imx: add esdhc specific suspend resume callback Dong Aisheng
2016-05-10 9:35 ` Adrian Hunter
2016-04-15 17:29 ` [PATCH 13/23] mmc: sdhci-esdhc-imx: restore watermark level setting after resume Dong Aisheng
2016-05-10 9:30 ` Adrian Hunter
2016-05-31 7:18 ` Dong Aisheng
2016-04-15 17:29 ` [PATCH 14/23] mmc: sdhci-esdhci-imx: disable DLL delay line settings explicitly Dong Aisheng
2016-05-10 11:02 ` Adrian Hunter
2016-04-15 17:29 ` [PATCH 15/23] mmc: sdhci-esdhc-imx: support setting tuning start point Dong Aisheng
2016-05-10 11:17 ` Adrian Hunter
2016-04-15 17:29 ` [PATCH 16/23] doc: dt: fsl-imx-esdhc: add set tuning start point binding Dong Aisheng
2016-04-15 17:29 ` [PATCH 17/23] mmc: sdhci: add standard hw auto retuning support Dong Aisheng
2016-05-10 8:35 ` Adrian Hunter
2016-05-26 12:11 ` Dong Aisheng
2016-04-15 17:29 ` [PATCH 18/23] mmc: sdhci-esdhc-imx: enable hw auto retuning for STD_TUNING Dong Aisheng
2016-05-10 11:19 ` Adrian Hunter
2016-05-26 12:21 ` Dong Aisheng
2016-04-15 17:29 ` [PATCH 19/23] mmc: sdhci-esdhc-imx: enable hw auto retuning for MAN_TUNING Dong Aisheng
2016-05-10 11:24 ` Adrian Hunter
2016-04-15 17:29 ` [PATCH 20/23] mmc: sdhci-esdhc-imx: fix strobe DLL lock wrong clock issue Dong Aisheng
2016-05-10 12:03 ` Adrian Hunter
2016-05-26 11:47 ` Dong Aisheng
2016-04-15 17:29 ` [PATCH 21/23] mmc: sdhci-esdhc-imx: factor out hw related intialization into function Dong Aisheng
2016-05-10 12:15 ` Adrian Hunter
2016-05-26 11:45 ` Dong Aisheng
2016-04-15 17:29 ` [PATCH 22/23] mmc: sdhci-esdhc-imx: move tuning static configuration into hwinit function Dong Aisheng
2016-05-10 13:07 ` Adrian Hunter
2016-04-15 17:29 ` [PATCH 23/23] mmc: sdhci-esdhc-imx: clear tuning bits during hwinit Dong Aisheng
2016-05-10 13:10 ` Adrian Hunter
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=57212073.7090006@intel.com \
--to=adrian.hunter@intel$(echo .)com \
--cc=linux-arm-kernel@lists$(echo .)infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox