| Message ID | 20200804192654.12783-2-krzk@kernel.org (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
| Series | clk/watchdog/ARM: Cleanup of various S3C bits | expand |
Hi Krzysztof, On 8/5/20 4:26 AM, Krzysztof Kozlowski wrote: > The s3c64xx_clk_init() is defined and used by the clk-s3c64xx driver and > also used in the mach-s3c64xx machine code. Move the declaration to a > header to fix W=1 build warning: > > drivers/clk/samsung/clk-s3c64xx.c:391:13: warning: no previous prototype for 's3c64xx_clk_init' [-Wmissing-prototypes] > 391 | void __init s3c64xx_clk_init(struct device_node *np, unsigned long xtal_f, > > Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org> > Reviewed-by: Tomasz Figa <tomasz.figa@gmail.com> > > --- > > Changes since v1: > 1. Drop __init from header (as suggested by Stephen), > 2. Add necessary header and forward declaration (as suggested by > Stephen), > 3. Add review tag. > --- > MAINTAINERS | 1 + > arch/arm/mach-s3c64xx/common.c | 1 + > arch/arm/mach-s3c64xx/common.h | 2 -- > drivers/clk/samsung/clk-s3c64xx.c | 1 + > include/linux/clk/samsung.h | 24 ++++++++++++++++++++++++ > 5 files changed, 27 insertions(+), 2 deletions(-) > create mode 100644 include/linux/clk/samsung.h > (snip) Looks good to me. Thanks. Acked-by: Chanwoo Choi <cw00.choi@samsung.com>
Quoting Krzysztof Kozlowski (2020-08-04 12:26:42) > The s3c64xx_clk_init() is defined and used by the clk-s3c64xx driver and > also used in the mach-s3c64xx machine code. Move the declaration to a > header to fix W=1 build warning: > > drivers/clk/samsung/clk-s3c64xx.c:391:13: warning: no previous prototype for 's3c64xx_clk_init' [-Wmissing-prototypes] > 391 | void __init s3c64xx_clk_init(struct device_node *np, unsigned long xtal_f, > > Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org> > Reviewed-by: Tomasz Figa <tomasz.figa@gmail.com> > > --- Reviewed-by: Stephen Boyd <sboyd@kernel.org>
diff --git a/MAINTAINERS b/MAINTAINERS index a2885ec15bb8..5675fc9bfa00 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -15294,6 +15294,7 @@ F: Documentation/devicetree/bindings/clock/samsung,s3c* F: Documentation/devicetree/bindings/clock/samsung,s5p* F: drivers/clk/samsung/ F: include/dt-bindings/clock/exynos*.h +F: include/linux/clk/samsung.h SAMSUNG SPI DRIVERS M: Kukjin Kim <kgene@kernel.org> diff --git a/arch/arm/mach-s3c64xx/common.c b/arch/arm/mach-s3c64xx/common.c index 13e91074308a..a655bf0c7802 100644 --- a/arch/arm/mach-s3c64xx/common.c +++ b/arch/arm/mach-s3c64xx/common.c @@ -24,6 +24,7 @@ #include <linux/platform_device.h> #include <linux/reboot.h> #include <linux/io.h> +#include <linux/clk/samsung.h> #include <linux/dma-mapping.h> #include <linux/irq.h> #include <linux/gpio.h> diff --git a/arch/arm/mach-s3c64xx/common.h b/arch/arm/mach-s3c64xx/common.h index 03670887a764..f4eca42cdc86 100644 --- a/arch/arm/mach-s3c64xx/common.h +++ b/arch/arm/mach-s3c64xx/common.h @@ -22,8 +22,6 @@ void s3c64xx_init_io(struct map_desc *mach_desc, int size); void s3c64xx_restart(enum reboot_mode mode, const char *cmd); struct device_node; -void s3c64xx_clk_init(struct device_node *np, unsigned long xtal_f, - unsigned long xusbxti_f, bool is_s3c6400, void __iomem *reg_base); void s3c64xx_set_xtal_freq(unsigned long freq); void s3c64xx_set_xusbxti_freq(unsigned long freq); diff --git a/drivers/clk/samsung/clk-s3c64xx.c b/drivers/clk/samsung/clk-s3c64xx.c index b96d33e5eb45..56f95b63f71f 100644 --- a/drivers/clk/samsung/clk-s3c64xx.c +++ b/drivers/clk/samsung/clk-s3c64xx.c @@ -7,6 +7,7 @@ #include <linux/slab.h> #include <linux/clk-provider.h> +#include <linux/clk/samsung.h> #include <linux/of.h> #include <linux/of_address.h> diff --git a/include/linux/clk/samsung.h b/include/linux/clk/samsung.h new file mode 100644 index 000000000000..7a0824b22eed --- /dev/null +++ b/include/linux/clk/samsung.h @@ -0,0 +1,24 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* + * Copyright (c) 2020 Krzysztof Kozlowski <krzk@kernel.org> + */ + +#ifndef __LINUX_CLK_SAMSUNG_H_ +#define __LINUX_CLK_SAMSUNG_H_ + +#include <linux/compiler_types.h> + +struct device_node; + +#ifdef CONFIG_ARCH_S3C64XX +void s3c64xx_clk_init(struct device_node *np, unsigned long xtal_f, + unsigned long xusbxti_f, bool s3c6400, + void __iomem *base); +#else +static inline void s3c64xx_clk_init(struct device_node *np, + unsigned long xtal_f, + unsigned long xusbxti_f, + bool s3c6400, void __iomem *base) { } +#endif /* CONFIG_ARCH_S3C64XX */ + +#endif /* __LINUX_CLK_SAMSUNG_H_ */
The s3c64xx_clk_init() is defined and used by the clk-s3c64xx driver and also used in the mach-s3c64xx machine code. Move the declaration to a header to fix W=1 build warning: drivers/clk/samsung/clk-s3c64xx.c:391:13: warning: no previous prototype for 's3c64xx_clk_init' [-Wmissing-prototypes] 391 | void __init s3c64xx_clk_init(struct device_node *np, unsigned long xtal_f, Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org> Reviewed-by: Tomasz Figa <tomasz.figa@gmail.com> --- Changes since v1: 1. Drop __init from header (as suggested by Stephen), 2. Add necessary header and forward declaration (as suggested by Stephen), 3. Add review tag. --- MAINTAINERS | 1 + arch/arm/mach-s3c64xx/common.c | 1 + arch/arm/mach-s3c64xx/common.h | 2 -- drivers/clk/samsung/clk-s3c64xx.c | 1 + include/linux/clk/samsung.h | 24 ++++++++++++++++++++++++ 5 files changed, 27 insertions(+), 2 deletions(-) create mode 100644 include/linux/clk/samsung.h