[1/1] arch: arm: mach-omap2: mmc: Move omap_mmc_notify_cover_event() prototype
diff mbox series

Message ID 20200701102317.235032-1-lee.jones@linaro.org
State New
Headers show
Series
  • [1/1] arch: arm: mach-omap2: mmc: Move omap_mmc_notify_cover_event() prototype
Related show

Commit Message

Lee Jones July 1, 2020, 10:23 a.m. UTC
When building the kernel with W=1 the build system complains of:

 drivers/mmc/host/omap.c:854:6: warning: no previous prototype for ‘omap_mmc_notify_cover_event’ [-Wmissing-prototypes]
 854 | void omap_mmc_notify_cover_event(struct device *dev, int num, int is_closed)
 | ^~~~~~~~~~~~~~~~~~~~~~~~~~~

If we move the prototype into a shared headerfile the build system
will be satisfied.  Rather than create a whole new headerfile just
for this purpose, it makes sense to use the already existing
mmc-omap.h.

Cc: Ulf Hansson <ulf.hansson@linaro.org>
Cc: linux-mmc@vger.kernel.org
Cc: Tony Lindgren <tony@atomide.com>
Cc: linux-omap@vger.kernel.org
Signed-off-by: Lee Jones <lee.jones@linaro.org>
---
 arch/arm/mach-omap2/mmc.h              | 4 ----
 include/linux/platform_data/mmc-omap.h | 3 +++
 2 files changed, 3 insertions(+), 4 deletions(-)

Comments

Tony Lindgren July 2, 2020, 4:34 p.m. UTC | #1
* Lee Jones <lee.jones@linaro.org> [200701 03:24]:
> When building the kernel with W=1 the build system complains of:
> 
>  drivers/mmc/host/omap.c:854:6: warning: no previous prototype for ‘omap_mmc_notify_cover_event’ [-Wmissing-prototypes]
>  854 | void omap_mmc_notify_cover_event(struct device *dev, int num, int is_closed)
>  | ^~~~~~~~~~~~~~~~~~~~~~~~~~~
> 
> If we move the prototype into a shared headerfile the build system
> will be satisfied.  Rather than create a whole new headerfile just
> for this purpose, it makes sense to use the already existing
> mmc-omap.h.

Looks good to me and should not conflict with anything so feel
free to queue along with your other patches:

Acked-by: Tony Lindgren <tony@atomide.com>


> Cc: Ulf Hansson <ulf.hansson@linaro.org>
> Cc: linux-mmc@vger.kernel.org
> Cc: Tony Lindgren <tony@atomide.com>
> Cc: linux-omap@vger.kernel.org
> Signed-off-by: Lee Jones <lee.jones@linaro.org>
> ---
>  arch/arm/mach-omap2/mmc.h              | 4 ----
>  include/linux/platform_data/mmc-omap.h | 3 +++
>  2 files changed, 3 insertions(+), 4 deletions(-)
> 
> diff --git a/arch/arm/mach-omap2/mmc.h b/arch/arm/mach-omap2/mmc.h
> index 7f4e053c34344..b5533e93cb632 100644
> --- a/arch/arm/mach-omap2/mmc.h
> +++ b/arch/arm/mach-omap2/mmc.h
> @@ -16,7 +16,3 @@ static inline int omap_msdi_reset(struct omap_hwmod *oh)
>  	return 0;
>  }
>  #endif
> -
> -/* called from board-specific card detection service routine */
> -extern void omap_mmc_notify_cover_event(struct device *dev, int slot,
> -					int is_closed);
> diff --git a/include/linux/platform_data/mmc-omap.h b/include/linux/platform_data/mmc-omap.h
> index 9acf0e87aa9be..f0b8947e6b07d 100644
> --- a/include/linux/platform_data/mmc-omap.h
> +++ b/include/linux/platform_data/mmc-omap.h
> @@ -116,3 +116,6 @@ struct omap_mmc_platform_data {
>  
>  	} slots[OMAP_MMC_MAX_SLOTS];
>  };
> +
> +extern void omap_mmc_notify_cover_event(struct device *dev, int slot,
> +					int is_closed);
> -- 
> 2.25.1
>
Ulf Hansson July 7, 2020, 6:54 a.m. UTC | #2
On Wed, 1 Jul 2020 at 12:23, Lee Jones <lee.jones@linaro.org> wrote:
>
> When building the kernel with W=1 the build system complains of:
>
>  drivers/mmc/host/omap.c:854:6: warning: no previous prototype for ‘omap_mmc_notify_cover_event’ [-Wmissing-prototypes]
>  854 | void omap_mmc_notify_cover_event(struct device *dev, int num, int is_closed)
>  | ^~~~~~~~~~~~~~~~~~~~~~~~~~~
>
> If we move the prototype into a shared headerfile the build system
> will be satisfied.  Rather than create a whole new headerfile just
> for this purpose, it makes sense to use the already existing
> mmc-omap.h.
>
> Cc: Ulf Hansson <ulf.hansson@linaro.org>
> Cc: linux-mmc@vger.kernel.org
> Cc: Tony Lindgren <tony@atomide.com>
> Cc: linux-omap@vger.kernel.org
> Signed-off-by: Lee Jones <lee.jones@linaro.org>

Applied for next, thanks!

Kind regards
Uffe


> ---
>  arch/arm/mach-omap2/mmc.h              | 4 ----
>  include/linux/platform_data/mmc-omap.h | 3 +++
>  2 files changed, 3 insertions(+), 4 deletions(-)
>
> diff --git a/arch/arm/mach-omap2/mmc.h b/arch/arm/mach-omap2/mmc.h
> index 7f4e053c34344..b5533e93cb632 100644
> --- a/arch/arm/mach-omap2/mmc.h
> +++ b/arch/arm/mach-omap2/mmc.h
> @@ -16,7 +16,3 @@ static inline int omap_msdi_reset(struct omap_hwmod *oh)
>         return 0;
>  }
>  #endif
> -
> -/* called from board-specific card detection service routine */
> -extern void omap_mmc_notify_cover_event(struct device *dev, int slot,
> -                                       int is_closed);
> diff --git a/include/linux/platform_data/mmc-omap.h b/include/linux/platform_data/mmc-omap.h
> index 9acf0e87aa9be..f0b8947e6b07d 100644
> --- a/include/linux/platform_data/mmc-omap.h
> +++ b/include/linux/platform_data/mmc-omap.h
> @@ -116,3 +116,6 @@ struct omap_mmc_platform_data {
>
>         } slots[OMAP_MMC_MAX_SLOTS];
>  };
> +
> +extern void omap_mmc_notify_cover_event(struct device *dev, int slot,
> +                                       int is_closed);
> --
> 2.25.1
>

Patch
diff mbox series

diff --git a/arch/arm/mach-omap2/mmc.h b/arch/arm/mach-omap2/mmc.h
index 7f4e053c34344..b5533e93cb632 100644
--- a/arch/arm/mach-omap2/mmc.h
+++ b/arch/arm/mach-omap2/mmc.h
@@ -16,7 +16,3 @@  static inline int omap_msdi_reset(struct omap_hwmod *oh)
 	return 0;
 }
 #endif
-
-/* called from board-specific card detection service routine */
-extern void omap_mmc_notify_cover_event(struct device *dev, int slot,
-					int is_closed);
diff --git a/include/linux/platform_data/mmc-omap.h b/include/linux/platform_data/mmc-omap.h
index 9acf0e87aa9be..f0b8947e6b07d 100644
--- a/include/linux/platform_data/mmc-omap.h
+++ b/include/linux/platform_data/mmc-omap.h
@@ -116,3 +116,6 @@  struct omap_mmc_platform_data {
 
 	} slots[OMAP_MMC_MAX_SLOTS];
 };
+
+extern void omap_mmc_notify_cover_event(struct device *dev, int slot,
+					int is_closed);