On 22 September 2017 at 14:37, Adrian Hunter <adrian.hunter@xxxxxxxxx> wrote:
> Export mmc_retune_hold_now() and mmc_retune_release() so they can be used
> by the block driver.
>
> Signed-off-by: Adrian Hunter <adrian.hunter@xxxxxxxxx>
I decided to squash patch 10/11/12 as those are all related to the
same problem when porting to blkmq.
So, thanks - applied for next!
Kind regards
Uffe
> ---
> drivers/mmc/core/host.c | 7 +------
> drivers/mmc/core/host.h | 7 ++++++-
> 2 files changed, 7 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/mmc/core/host.c b/drivers/mmc/core/host.c
> index b624dbb6cd15..1539ce0da196 100644
> --- a/drivers/mmc/core/host.c
> +++ b/drivers/mmc/core/host.c
> @@ -111,12 +111,6 @@ void mmc_retune_hold(struct mmc_host *host)
> host->hold_retune += 1;
> }
>
> -void mmc_retune_hold_now(struct mmc_host *host)
> -{
> - host->retune_now = 0;
> - host->hold_retune += 1;
> -}
> -
> void mmc_retune_release(struct mmc_host *host)
> {
> if (host->hold_retune)
> @@ -124,6 +118,7 @@ void mmc_retune_release(struct mmc_host *host)
> else
> WARN_ON(1);
> }
> +EXPORT_SYMBOL(mmc_retune_release);
>
> int mmc_retune(struct mmc_host *host)
> {
> diff --git a/drivers/mmc/core/host.h b/drivers/mmc/core/host.h
> index 170fe5947087..6eaf558e62d6 100644
> --- a/drivers/mmc/core/host.h
> +++ b/drivers/mmc/core/host.h
> @@ -19,12 +19,17 @@
> void mmc_retune_enable(struct mmc_host *host);
> void mmc_retune_disable(struct mmc_host *host);
> void mmc_retune_hold(struct mmc_host *host);
> -void mmc_retune_hold_now(struct mmc_host *host);
> void mmc_retune_release(struct mmc_host *host);
> int mmc_retune(struct mmc_host *host);
> void mmc_retune_pause(struct mmc_host *host);
> void mmc_retune_unpause(struct mmc_host *host);
>
> +static inline void mmc_retune_hold_now(struct mmc_host *host)
> +{
> + host->retune_now = 0;
> + host->hold_retune += 1;
> +}
> +
> static inline void mmc_retune_recheck(struct mmc_host *host)
> {
> if (host->hold_retune <= 1)
> --
> 1.9.1
>
