lkml.org 
[lkml]   [2020]   [Jul]   [13]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 16/25] arch: arm: mach-at91: pm: Move prototypes to mutually included header
    Date
    Both the caller and the supplier's source file should have access to
    the include file containing the prototypes.

    Fixes the following W=1 kernel build warning(s):

    drivers/pinctrl/pinctrl-at91.c:1637:6: warning: no previous prototype for ‘at91_pinctrl_gpio_suspend’ [-Wmissing-prototypes]
    1637 | void at91_pinctrl_gpio_suspend(void)
    | ^~~~~~~~~~~~~~~~~~~~~~~~~
    drivers/pinctrl/pinctrl-at91.c:1661:6: warning: no previous prototype for ‘at91_pinctrl_gpio_resume’ [-Wmissing-prototypes]
    1661 | void at91_pinctrl_gpio_resume(void)
    | ^~~~~~~~~~~~~~~~~~~~~~~~

    Cc: Russell King <linux@armlinux.org.uk>
    Cc: Nicolas Ferre <nicolas.ferre@microchip.com>
    Cc: Alexandre Belloni <alexandre.belloni@bootlin.com>
    Cc: Ludovic Desroches <ludovic.desroches@microchip.com>
    Signed-off-by: Lee Jones <lee.jones@linaro.org>
    ---
    arch/arm/mach-at91/pm.c | 17 ++++++-----------
    drivers/pinctrl/pinctrl-at91.c | 1 +
    include/linux/platform_data/atmel.h | 5 +++++
    3 files changed, 12 insertions(+), 11 deletions(-)

    diff --git a/arch/arm/mach-at91/pm.c b/arch/arm/mach-at91/pm.c
    index 074bde64064e4..59f2a2d6fbbb8 100644
    --- a/arch/arm/mach-at91/pm.c
    +++ b/arch/arm/mach-at91/pm.c
    @@ -25,17 +25,6 @@
    #include "generic.h"
    #include "pm.h"

    -/*
    - * FIXME: this is needed to communicate between the pinctrl driver and
    - * the PM implementation in the machine. Possibly part of the PM
    - * implementation should be moved down into the pinctrl driver and get
    - * called as part of the generic suspend/resume path.
    - */
    -#ifdef CONFIG_PINCTRL_AT91
    -extern void at91_pinctrl_gpio_suspend(void);
    -extern void at91_pinctrl_gpio_resume(void);
    -#endif
    -
    struct at91_soc_pm {
    int (*config_shdwc_ws)(void __iomem *shdwc, u32 *mode, u32 *polarity);
    int (*config_pmc_ws)(void __iomem *pmc, u32 mode, u32 polarity);
    @@ -325,6 +314,12 @@ static void at91_pm_suspend(suspend_state_t state)
    static int at91_pm_enter(suspend_state_t state)
    {
    #ifdef CONFIG_PINCTRL_AT91
    + /*
    + * FIXME: this is needed to communicate between the pinctrl driver and
    + * the PM implementation in the machine. Possibly part of the PM
    + * implementation should be moved down into the pinctrl driver and get
    + * called as part of the generic suspend/resume path.
    + */
    at91_pinctrl_gpio_suspend();
    #endif

    diff --git a/drivers/pinctrl/pinctrl-at91.c b/drivers/pinctrl/pinctrl-at91.c
    index 9c52130876597..37997e5ab0538 100644
    --- a/drivers/pinctrl/pinctrl-at91.c
    +++ b/drivers/pinctrl/pinctrl-at91.c
    @@ -22,6 +22,7 @@
    #include <linux/pinctrl/pinmux.h>
    /* Since we request GPIOs from ourself */
    #include <linux/pinctrl/consumer.h>
    +#include <linux/platform_data/atmel.h>

    #include "pinctrl-at91.h"
    #include "core.h"
    diff --git a/include/linux/platform_data/atmel.h b/include/linux/platform_data/atmel.h
    index 99e6069c5fd89..666ef482ea8c0 100644
    --- a/include/linux/platform_data/atmel.h
    +++ b/include/linux/platform_data/atmel.h
    @@ -28,4 +28,9 @@ static inline int at91_suspend_entering_slow_clock(void)
    }
    #endif

    +#ifdef CONFIG_PINCTRL_AT91
    +void at91_pinctrl_gpio_suspend(void);
    +void at91_pinctrl_gpio_resume(void);
    +#endif
    +
    #endif /* __ATMEL_H__ */
    --
    2.25.1
    \
     
     \ /
      Last update: 2020-07-13 16:50    [W:4.042 / U:0.424 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site