Commit a9ae9c52 authored by Arnd Bergmann's avatar Arnd Bergmann

ARM: pxa: fix missing-prototypes warnings

The PXA platform has a number of configurations that end up with
a warning like these when building with W=1:

drivers/hwmon/max1111.c:83:5: error: no previous prototype for 'max1111_read_channel' [-Werror=missing-prototypes]
arch/arm/mach-pxa/reset.c:86:6: error: no previous prototype for 'pxa_restart' [-Werror=missing-prototypes]
arch/arm/mach-pxa/mfp-pxa2xx.c:254:5: error: no previous prototype for 'keypad_set_wake' [-Werror=missing-prototypes]
drivers/clk/pxa/clk-pxa25x.c:70:14: error: no previous prototype for 'pxa25x_get_clk_frequency_khz' [-Werror=missing-prototypes]
drivers/clk/pxa/clk-pxa25x.c:325:12: error: no previous prototype for 'pxa25x_clocks_init' [-Werror=missing-prototypes]
drivers/clk/pxa/clk-pxa27x.c:74:14: error: no previous prototype for 'pxa27x_get_clk_frequency_khz' [-Werror=missing-prototypes]
drivers/clk/pxa/clk-pxa27x.c:102:6: error: no previous prototype for 'pxa27x_is_ppll_disabled' [-Werror=missing-prototypes]
drivers/clk/pxa/clk-pxa27x.c:470:12: error: no previous prototype for 'pxa27x_clocks_init' [-Werror=missing-prototypes]
arch/arm/mach-pxa/pxa27x.c:44:6: error: no previous prototype for 'pxa27x_clear_otgph' [-Werror=missing-prototypes]
arch/arm/mach-pxa/pxa27x.c:58:6: error: no previous prototype for 'pxa27x_configure_ac97reset' [-Werror=missing-prototypes]
arch/arm/mach-pxa/spitz_pm.c:170:15: error: no previous prototype for 'spitzpm_read_devdata' [-Werror=missing-prototypes]

The problem is that there is a declaration for each of these, but
it's only seen by the caller and not the callee. Moving these
into appropriate header files ensures that both use the same
calling conventions and it avoids the warnings.
Acked-by: default avatarStephen Boyd <sboyd@kernel.org>
Link: https://lore.kernel.org/r/20230516153109.514251-11-arnd@kernel.orgSigned-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parent f8ef1233
...@@ -27,7 +27,6 @@ extern void __init pxa25x_map_io(void); ...@@ -27,7 +27,6 @@ extern void __init pxa25x_map_io(void);
extern void __init pxa26x_init_irq(void); extern void __init pxa26x_init_irq(void);
#define pxa27x_handle_irq ichp_handle_irq #define pxa27x_handle_irq ichp_handle_irq
extern unsigned pxa27x_get_clk_frequency_khz(int);
extern void __init pxa27x_init_irq(void); extern void __init pxa27x_init_irq(void);
extern void __init pxa27x_map_io(void); extern void __init pxa27x_map_io(void);
...@@ -52,18 +51,4 @@ extern void pxa2xx_clear_reset_status(unsigned int); ...@@ -52,18 +51,4 @@ extern void pxa2xx_clear_reset_status(unsigned int);
static inline void pxa2xx_clear_reset_status(unsigned int mask) {} static inline void pxa2xx_clear_reset_status(unsigned int mask) {}
#endif #endif
/*
* Once fully converted to the clock framework, all these functions should be
* removed, and replaced with a clk_get(NULL, "core").
*/
#ifdef CONFIG_PXA25x
extern unsigned pxa25x_get_clk_frequency_khz(int);
#else
#define pxa25x_get_clk_frequency_khz(x) (0)
#endif
#ifdef CONFIG_PXA27x
#else
#define pxa27x_get_clk_frequency_khz(x) (0)
#endif
...@@ -20,6 +20,7 @@ ...@@ -20,6 +20,7 @@
#include "pxa2xx-regs.h" #include "pxa2xx-regs.h"
#include "mfp-pxa2xx.h" #include "mfp-pxa2xx.h"
#include "mfp-pxa27x.h"
#include "generic.h" #include "generic.h"
......
...@@ -27,6 +27,7 @@ ...@@ -27,6 +27,7 @@
#include <linux/irqchip.h> #include <linux/irqchip.h>
#include <linux/platform_data/mmp_dma.h> #include <linux/platform_data/mmp_dma.h>
#include <linux/soc/pxa/cpu.h> #include <linux/soc/pxa/cpu.h>
#include <linux/soc/pxa/smemc.h>
#include <asm/mach/map.h> #include <asm/mach/map.h>
#include <asm/suspend.h> #include <asm/suspend.h>
......
...@@ -24,6 +24,7 @@ ...@@ -24,6 +24,7 @@
#include <linux/platform_data/i2c-pxa.h> #include <linux/platform_data/i2c-pxa.h>
#include <linux/platform_data/mmp_dma.h> #include <linux/platform_data/mmp_dma.h>
#include <linux/soc/pxa/cpu.h> #include <linux/soc/pxa/cpu.h>
#include <linux/soc/pxa/smemc.h>
#include <asm/mach/map.h> #include <asm/mach/map.h>
#include <asm/irq.h> #include <asm/irq.h>
...@@ -31,7 +32,9 @@ ...@@ -31,7 +32,9 @@
#include "irqs.h" #include "irqs.h"
#include "pxa27x.h" #include "pxa27x.h"
#include "reset.h" #include "reset.h"
#include <linux/platform_data/pxa2xx_udc.h>
#include <linux/platform_data/usb-ohci-pxa27x.h> #include <linux/platform_data/usb-ohci-pxa27x.h>
#include <linux/platform_data/asoc-pxa.h>
#include "pm.h" #include "pm.h"
#include "addr-map.h" #include "addr-map.h"
#include "smemc.h" #include "smemc.h"
......
...@@ -10,6 +10,7 @@ ...@@ -10,6 +10,7 @@
#include "regs-ost.h" #include "regs-ost.h"
#include "reset.h" #include "reset.h"
#include "smemc.h" #include "smemc.h"
#include "generic.h"
static void do_hw_reset(void); static void do_hw_reset(void);
......
...@@ -166,7 +166,7 @@ static bool spitz_charger_wakeup(void) ...@@ -166,7 +166,7 @@ static bool spitz_charger_wakeup(void)
gpio_get_value(SPITZ_GPIO_SYNC); gpio_get_value(SPITZ_GPIO_SYNC);
} }
unsigned long spitzpm_read_devdata(int type) static unsigned long spitzpm_read_devdata(int type)
{ {
switch (type) { switch (type) {
case SHARPSL_STATUS_ACIN: case SHARPSL_STATUS_ACIN:
......
...@@ -11,10 +11,12 @@ ...@@ -11,10 +11,12 @@
*/ */
#include <linux/clk-provider.h> #include <linux/clk-provider.h>
#include <linux/clk.h> #include <linux/clk.h>
#include <linux/clk/pxa.h>
#include <linux/clkdev.h> #include <linux/clkdev.h>
#include <linux/io.h> #include <linux/io.h>
#include <linux/of.h> #include <linux/of.h>
#include <linux/soc/pxa/smemc.h> #include <linux/soc/pxa/smemc.h>
#include <linux/soc/pxa/cpu.h>
#include <dt-bindings/clock/pxa-clock.h> #include <dt-bindings/clock/pxa-clock.h>
#include "clk-pxa.h" #include "clk-pxa.h"
......
...@@ -12,6 +12,7 @@ ...@@ -12,6 +12,7 @@
#include <linux/clkdev.h> #include <linux/clkdev.h>
#include <linux/of.h> #include <linux/of.h>
#include <linux/soc/pxa/smemc.h> #include <linux/soc/pxa/smemc.h>
#include <linux/clk/pxa.h>
#include <dt-bindings/clock/pxa-clock.h> #include <dt-bindings/clock/pxa-clock.h>
#include "clk-pxa.h" #include "clk-pxa.h"
...@@ -99,7 +100,7 @@ unsigned int pxa27x_get_clk_frequency_khz(int info) ...@@ -99,7 +100,7 @@ unsigned int pxa27x_get_clk_frequency_khz(int info)
return (unsigned int)clks[0] / KHz; return (unsigned int)clks[0] / KHz;
} }
bool pxa27x_is_ppll_disabled(void) static bool pxa27x_is_ppll_disabled(void)
{ {
unsigned long ccsr = readl(clk_regs + CCSR); unsigned long ccsr = readl(clk_regs + CCSR);
......
...@@ -80,6 +80,7 @@ static int max1111_read(struct device *dev, int channel) ...@@ -80,6 +80,7 @@ static int max1111_read(struct device *dev, int channel)
#ifdef CONFIG_SHARPSL_PM #ifdef CONFIG_SHARPSL_PM
static struct max1111_data *the_max1111; static struct max1111_data *the_max1111;
int max1111_read_channel(int channel);
int max1111_read_channel(int channel) int max1111_read_channel(int channel)
{ {
if (!the_max1111 || !the_max1111->spi) if (!the_max1111 || !the_max1111->spi)
......
...@@ -2472,12 +2472,6 @@ static void pxa_udc_shutdown(struct platform_device *_dev) ...@@ -2472,12 +2472,6 @@ static void pxa_udc_shutdown(struct platform_device *_dev)
udc_disable(udc); udc_disable(udc);
} }
#ifdef CONFIG_PXA27x
extern void pxa27x_clear_otgph(void);
#else
#define pxa27x_clear_otgph() do {} while (0)
#endif
#ifdef CONFIG_PM #ifdef CONFIG_PM
/** /**
* pxa_udc_suspend - Suspend udc device * pxa_udc_suspend - Suspend udc device
......
...@@ -29,6 +29,7 @@ ...@@ -29,6 +29,7 @@
#include <linux/of_platform.h> #include <linux/of_platform.h>
#include <linux/of_gpio.h> #include <linux/of_gpio.h>
#include <linux/platform_data/usb-ohci-pxa27x.h> #include <linux/platform_data/usb-ohci-pxa27x.h>
#include <linux/platform_data/pxa2xx_udc.h>
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <linux/regulator/consumer.h> #include <linux/regulator/consumer.h>
#include <linux/signal.h> #include <linux/signal.h>
...@@ -263,12 +264,6 @@ static inline void pxa27x_reset_hc(struct pxa27x_ohci *pxa_ohci) ...@@ -263,12 +264,6 @@ static inline void pxa27x_reset_hc(struct pxa27x_ohci *pxa_ohci)
__raw_writel(uhchr & ~UHCHR_FHR, pxa_ohci->mmio_base + UHCHR); __raw_writel(uhchr & ~UHCHR_FHR, pxa_ohci->mmio_base + UHCHR);
} }
#ifdef CONFIG_PXA27x
extern void pxa27x_clear_otgph(void);
#else
#define pxa27x_clear_otgph() do {} while (0)
#endif
static int pxa27x_start_hc(struct pxa27x_ohci *pxa_ohci, struct device *dev) static int pxa27x_start_hc(struct pxa27x_ohci *pxa_ohci, struct device *dev)
{ {
int retval; int retval;
......
...@@ -27,5 +27,6 @@ typedef struct { ...@@ -27,5 +27,6 @@ typedef struct {
} pxa2xx_audio_ops_t; } pxa2xx_audio_ops_t;
extern void pxa_set_ac97_info(pxa2xx_audio_ops_t *ops); extern void pxa_set_ac97_info(pxa2xx_audio_ops_t *ops);
extern void pxa27x_configure_ac97reset(int reset_gpio, bool to_gpio);
#endif #endif
...@@ -25,4 +25,10 @@ struct pxa2xx_udc_mach_info { ...@@ -25,4 +25,10 @@ struct pxa2xx_udc_mach_info {
int gpio_pullup; /* high == pullup activated */ int gpio_pullup; /* high == pullup activated */
}; };
#ifdef CONFIG_PXA27x
extern void pxa27x_clear_otgph(void);
#else
#define pxa27x_clear_otgph() do {} while (0)
#endif
#endif #endif
...@@ -10,4 +10,20 @@ int pxa2xx_smemc_get_sdram_rows(void); ...@@ -10,4 +10,20 @@ int pxa2xx_smemc_get_sdram_rows(void);
unsigned int pxa3xx_smemc_get_memclkdiv(void); unsigned int pxa3xx_smemc_get_memclkdiv(void);
void __iomem *pxa_smemc_get_mdrefr(void); void __iomem *pxa_smemc_get_mdrefr(void);
/*
* Once fully converted to the clock framework, all these functions should be
* removed, and replaced with a clk_get(NULL, "core").
*/
#ifdef CONFIG_PXA25x
extern unsigned pxa25x_get_clk_frequency_khz(int);
#else
#define pxa25x_get_clk_frequency_khz(x) (0)
#endif
#ifdef CONFIG_PXA27x
extern unsigned pxa27x_get_clk_frequency_khz(int);
#else
#define pxa27x_get_clk_frequency_khz(x) (0)
#endif
#endif #endif
...@@ -33,8 +33,6 @@ static struct clk *ac97conf_clk; ...@@ -33,8 +33,6 @@ static struct clk *ac97conf_clk;
static int reset_gpio; static int reset_gpio;
static void __iomem *ac97_reg_base; static void __iomem *ac97_reg_base;
extern void pxa27x_configure_ac97reset(int reset_gpio, bool to_gpio);
/* /*
* Beware PXA27x bugs: * Beware PXA27x bugs:
* *
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment