From: Shawn Lin <shawn.lin@rock-chips.com>
To: Ulf Hansson <ulf.hansson@linaro.org>, linux-mmc@vger.kernel.org
Cc: shawn.lin@rock-chips.com, Jaehoon Chung <jh80.chung@samsung.com>,
Adrian Hunter <adrian.hunter@intel.com>,
Linus Walleij <linus.walleij@linaro.org>
Subject: Re: [PATCH v3 14/15] mmc: core: Move public functions from host.h to private headers
Date: Mon, 16 Jan 2017 11:14:59 +0800 [thread overview]
Message-ID: <0fff3dac-891c-78a8-d3b8-f99d42e057e6@rock-chips.com> (raw)
In-Reply-To: <1484313256-25993-15-git-send-email-ulf.hansson@linaro.org>
On 2017/1/13 21:14, Ulf Hansson wrote:
> A significant amount of functions are available through the public mmc
> host.h header file. Let's slim down this public mmc interface, as to
> prevent users from abusing it, by moving some of the functions to private
> mmc host.h header file.
>
> This change concentrates on moving the functions into private mmc headers,
> following changes may continue with additional clean-ups.
>
The same comment for the order of header files, anyway
Reviewed-by: Shawn Lin <shawn.lin@rock-chips.com>
> Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
> Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
> ---
> drivers/mmc/core/block.c | 1 +
> drivers/mmc/core/bus.c | 1 +
> drivers/mmc/core/debugfs.c | 1 +
> drivers/mmc/core/host.h | 49 ++++++++++++++++++++++++++++++++++++++++++++-
> drivers/mmc/core/mmc_test.c | 1 +
> drivers/mmc/core/sd.c | 1 +
> drivers/mmc/core/sdio.c | 1 +
> include/linux/mmc/host.h | 48 ++------------------------------------------
> 8 files changed, 56 insertions(+), 47 deletions(-)
>
> diff --git a/drivers/mmc/core/block.c b/drivers/mmc/core/block.c
> index a8300be..7bd0338 100644
> --- a/drivers/mmc/core/block.c
> +++ b/drivers/mmc/core/block.c
> @@ -49,6 +49,7 @@
> #include "block.h"
> #include "core.h"
> #include "card.h"
> +#include "host.h"
> #include "bus.h"
> #include "mmc_ops.h"
> #include "sd_ops.h"
> diff --git a/drivers/mmc/core/bus.c b/drivers/mmc/core/bus.c
> index 3be2e6a..3012465 100644
> --- a/drivers/mmc/core/bus.c
> +++ b/drivers/mmc/core/bus.c
> @@ -24,6 +24,7 @@
>
> #include "core.h"
> #include "card.h"
> +#include "host.h"
> #include "sdio_cis.h"
> #include "bus.h"
>
> diff --git a/drivers/mmc/core/debugfs.c b/drivers/mmc/core/debugfs.c
> index 2843e6a..a1fba57 100644
> --- a/drivers/mmc/core/debugfs.c
> +++ b/drivers/mmc/core/debugfs.c
> @@ -21,6 +21,7 @@
>
> #include "core.h"
> #include "card.h"
> +#include "host.h"
> #include "mmc_ops.h"
>
> #ifdef CONFIG_FAIL_MMC_REQUEST
> diff --git a/drivers/mmc/core/host.h b/drivers/mmc/core/host.h
> index 366ce79..fb6a76a 100644
> --- a/drivers/mmc/core/host.h
> +++ b/drivers/mmc/core/host.h
> @@ -11,7 +11,7 @@
> #ifndef _MMC_CORE_HOST_H
> #define _MMC_CORE_HOST_H
>
> -struct mmc_host;
> +#include <linux/mmc/host.h>
>
> int mmc_register_host_class(void);
> void mmc_unregister_host_class(void);
> @@ -21,6 +21,53 @@
> void mmc_retune_hold(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_recheck(struct mmc_host *host)
> +{
> + if (host->hold_retune <= 1)
> + host->retune_now = 1;
> +}
> +
> +static inline int mmc_host_cmd23(struct mmc_host *host)
> +{
> + return host->caps & MMC_CAP_CMD23;
> +}
> +
> +static inline int mmc_boot_partition_access(struct mmc_host *host)
> +{
> + return !(host->caps2 & MMC_CAP2_BOOTPART_NOACC);
> +}
> +
> +static inline int mmc_host_uhs(struct mmc_host *host)
> +{
> + return host->caps &
> + (MMC_CAP_UHS_SDR12 | MMC_CAP_UHS_SDR25 |
> + MMC_CAP_UHS_SDR50 | MMC_CAP_UHS_SDR104 |
> + MMC_CAP_UHS_DDR50);
> +}
> +
> +static inline bool mmc_card_hs200(struct mmc_card *card)
> +{
> + return card->host->ios.timing == MMC_TIMING_MMC_HS200;
> +}
> +
> +static inline bool mmc_card_ddr52(struct mmc_card *card)
> +{
> + return card->host->ios.timing == MMC_TIMING_MMC_DDR52;
> +}
> +
> +static inline bool mmc_card_hs400(struct mmc_card *card)
> +{
> + return card->host->ios.timing == MMC_TIMING_MMC_HS400;
> +}
> +
> +static inline bool mmc_card_hs400es(struct mmc_card *card)
> +{
> + return card->host->ios.enhanced_strobe;
> +}
> +
>
> #endif
>
> diff --git a/drivers/mmc/core/mmc_test.c b/drivers/mmc/core/mmc_test.c
> index 8dd2115..83d193c 100644
> --- a/drivers/mmc/core/mmc_test.c
> +++ b/drivers/mmc/core/mmc_test.c
> @@ -24,6 +24,7 @@
>
> #include "core.h"
> #include "card.h"
> +#include "host.h"
> #include "bus.h"
>
> #define RESULT_OK 0
> diff --git a/drivers/mmc/core/sd.c b/drivers/mmc/core/sd.c
> index d66b08d..8b4f139 100644
> --- a/drivers/mmc/core/sd.c
> +++ b/drivers/mmc/core/sd.c
> @@ -23,6 +23,7 @@
>
> #include "core.h"
> #include "card.h"
> +#include "host.h"
> #include "bus.h"
> #include "mmc_ops.h"
> #include "sd.h"
> diff --git a/drivers/mmc/core/sdio.c b/drivers/mmc/core/sdio.c
> index 5419c0d..261c886 100644
> --- a/drivers/mmc/core/sdio.c
> +++ b/drivers/mmc/core/sdio.c
> @@ -21,6 +21,7 @@
>
> #include "core.h"
> #include "card.h"
> +#include "host.h"
> #include "bus.h"
> #include "sd.h"
> #include "sdio_bus.h"
> diff --git a/include/linux/mmc/host.h b/include/linux/mmc/host.h
> index 7de0519..97699d5 100644
> --- a/include/linux/mmc/host.h
> +++ b/include/linux/mmc/host.h
> @@ -473,56 +473,20 @@ static inline int mmc_card_wake_sdio_irq(struct mmc_host *host)
> return host->pm_flags & MMC_PM_WAKE_SDIO_IRQ;
> }
>
> -static inline int mmc_host_cmd23(struct mmc_host *host)
> -{
> - return host->caps & MMC_CAP_CMD23;
> -}
> -
> -static inline int mmc_boot_partition_access(struct mmc_host *host)
> -{
> - return !(host->caps2 & MMC_CAP2_BOOTPART_NOACC);
> -}
> -
> -static inline int mmc_host_uhs(struct mmc_host *host)
> -{
> - return host->caps &
> - (MMC_CAP_UHS_SDR12 | MMC_CAP_UHS_SDR25 |
> - MMC_CAP_UHS_SDR50 | MMC_CAP_UHS_SDR104 |
> - MMC_CAP_UHS_DDR50);
> -}
> -
> +/* TODO: Move to private header */
> static inline int mmc_card_hs(struct mmc_card *card)
> {
> return card->host->ios.timing == MMC_TIMING_SD_HS ||
> card->host->ios.timing == MMC_TIMING_MMC_HS;
> }
>
> +/* TODO: Move to private header */
> static inline int mmc_card_uhs(struct mmc_card *card)
> {
> return card->host->ios.timing >= MMC_TIMING_UHS_SDR12 &&
> card->host->ios.timing <= MMC_TIMING_UHS_DDR50;
> }
>
> -static inline bool mmc_card_hs200(struct mmc_card *card)
> -{
> - return card->host->ios.timing == MMC_TIMING_MMC_HS200;
> -}
> -
> -static inline bool mmc_card_ddr52(struct mmc_card *card)
> -{
> - return card->host->ios.timing == MMC_TIMING_MMC_DDR52;
> -}
> -
> -static inline bool mmc_card_hs400(struct mmc_card *card)
> -{
> - return card->host->ios.timing == MMC_TIMING_MMC_HS400;
> -}
> -
> -static inline bool mmc_card_hs400es(struct mmc_card *card)
> -{
> - return card->host->ios.enhanced_strobe;
> -}
> -
> void mmc_retune_timer_stop(struct mmc_host *host);
>
> static inline void mmc_retune_needed(struct mmc_host *host)
> @@ -531,12 +495,6 @@ static inline void mmc_retune_needed(struct mmc_host *host)
> host->need_retune = 1;
> }
>
> -static inline void mmc_retune_recheck(struct mmc_host *host)
> -{
> - if (host->hold_retune <= 1)
> - host->retune_now = 1;
> -}
> -
> static inline bool mmc_can_retune(struct mmc_host *host)
> {
> return host->can_retune == 1;
> @@ -544,7 +502,5 @@ static inline bool mmc_can_retune(struct mmc_host *host)
>
> int mmc_send_tuning(struct mmc_host *host, u32 opcode, int *cmd_error);
> int mmc_abort_tuning(struct mmc_host *host, u32 opcode);
> -void mmc_retune_pause(struct mmc_host *host);
> -void mmc_retune_unpause(struct mmc_host *host);
>
> #endif /* LINUX_MMC_HOST_H */
>
--
Best Regards
Shawn Lin
next prev parent reply other threads:[~2017-01-16 3:15 UTC|newest]
Thread overview: 50+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-01-13 13:14 [PATCH v3 00/15] mmc: core: A start to slim down public mmc headers Ulf Hansson
2017-01-13 13:14 ` [PATCH v3 01/15] ARM: pxa: Don't rely on public mmc header to include leds.h Ulf Hansson
2017-01-13 13:14 ` Ulf Hansson
2017-01-20 8:01 ` Robert Jarzmik
2017-01-20 8:01 ` Robert Jarzmik
2017-01-20 8:27 ` Ulf Hansson
2017-01-20 8:27 ` Ulf Hansson
2017-01-20 19:34 ` Robert Jarzmik
2017-01-20 19:34 ` Robert Jarzmik
2017-01-22 10:25 ` Robert Jarzmik
2017-01-22 10:25 ` Robert Jarzmik
2017-01-24 7:57 ` Ulf Hansson
2017-01-24 7:57 ` Ulf Hansson
2017-01-24 16:34 ` Robert Jarzmik
2017-01-24 16:34 ` Robert Jarzmik
2017-01-13 13:14 ` [PATCH v3 02/15] ARM: davinci: " Ulf Hansson
2017-01-13 13:14 ` Ulf Hansson
2017-01-13 13:26 ` Sekhar Nori
2017-01-13 13:26 ` Sekhar Nori
2017-01-13 13:14 ` [PATCH v3 03/15] ARM: davinci: Don't rely on public mmc header to include interrupt.h Ulf Hansson
2017-01-13 13:14 ` Ulf Hansson
2017-01-13 13:38 ` Sekhar Nori
2017-01-13 13:38 ` Sekhar Nori
2017-01-13 13:14 ` [PATCH v3 04/15] MIPS: Alchemy: " Ulf Hansson
2017-01-13 13:14 ` Ulf Hansson
2017-01-17 14:50 ` Ralf Baechle
2017-01-13 13:14 ` [PATCH v3 05/15] mmc: core: First step in cleaning up public mmc header files Ulf Hansson
2017-01-16 2:54 ` Shawn Lin
2017-01-13 13:14 ` [PATCH v3 06/15] mmc: core: First step in cleaning up private " Ulf Hansson
2017-01-16 2:56 ` Shawn Lin
2017-01-13 13:14 ` [PATCH v3 07/15] mmc: core: Move public functions from core.h to private headers Ulf Hansson
2017-01-16 3:01 ` Shawn Lin
2017-01-17 15:07 ` Ulf Hansson
2017-01-13 13:14 ` [PATCH v3 08/15] mmc: core: Move some host specific public functions to host.h Ulf Hansson
2017-01-16 3:02 ` Shawn Lin
2017-01-13 13:14 ` [PATCH v3 09/15] mmc: core: Move erase/trim/discard defines from public core.h to mmc.h Ulf Hansson
2017-01-16 3:05 ` Shawn Lin
2017-01-17 15:06 ` Ulf Hansson
2017-01-13 13:14 ` [PATCH v3 10/15] mmc: core: Remove unused struct _mmc_csd from public mmc.h header Ulf Hansson
2017-01-16 3:07 ` Shawn Lin
2017-01-17 15:07 ` Ulf Hansson
2017-01-13 13:14 ` [PATCH v3 11/15] mmc: omap: Don't use mmc_card_present() when validating for inserted card Ulf Hansson
2017-01-13 13:14 ` [PATCH v3 12/15] mmc: vub300: " Ulf Hansson
2017-01-13 13:14 ` [PATCH v3 13/15] mmc: core: Move public functions from card.h to private headers Ulf Hansson
2017-01-16 3:10 ` Shawn Lin
2017-01-13 13:14 ` [PATCH v3 14/15] mmc: core: Move public functions from host.h " Ulf Hansson
2017-01-16 3:14 ` Shawn Lin [this message]
2017-01-13 13:14 ` [PATCH v3 15/15] mmc: core: Don't use extern declarations of public mmc functions Ulf Hansson
2017-01-16 3:16 ` Shawn Lin
2017-01-17 15:08 ` [PATCH v3 00/15] mmc: core: A start to slim down public mmc headers Ulf Hansson
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=0fff3dac-891c-78a8-d3b8-f99d42e057e6@rock-chips.com \
--to=shawn.lin@rock-chips.com \
--cc=adrian.hunter@intel.com \
--cc=jh80.chung@samsung.com \
--cc=linus.walleij@linaro.org \
--cc=linux-mmc@vger.kernel.org \
--cc=ulf.hansson@linaro.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.