| Message ID | 20200804192654.12783-14-krzk@kernel.org |
|---|---|
| State | New |
| Headers | show |
| Series | [v2,01/13] clk: samsung: s3c64xx: declare s3c64xx_clk_init() in shared header | expand |
diff --git a/arch/arm/mach-s3c24xx/setup-camif.c b/arch/arm/mach-s3c24xx/setup-camif.c index 2b262fae3f61..4046afaad645 100644 --- a/arch/arm/mach-s3c24xx/setup-camif.c +++ b/arch/arm/mach-s3c24xx/setup-camif.c @@ -7,6 +7,7 @@ #include <linux/gpio.h> #include <plat/gpio-cfg.h> #include <mach/gpio-samsung.h> +#include <media/drv-intf/s3c_camif.h> /* Number of camera port pins, without FIELD */ #define S3C_CAMIF_NUM_GPIOS 13 @@ -53,7 +54,7 @@ int s3c_camif_gpio_get(void) return 0; } -void s3c_camif_gpio_put(void) +int s3c_camif_gpio_put(void) { int i, gpio_start, gpio_reset; @@ -64,4 +65,6 @@ void s3c_camif_gpio_put(void) if (gpio != gpio_reset) gpio_free(gpio); } + + return 0; }
The s3c_camif_gpio_put() declaration in include/media/drv-intf/s3c_camif.h header was different than definition. Fixing this allows to include that header to also fix the W=1 compile warnings: arch/arm/mach-s3c24xx/setup-camif.c:28:5: warning: no previous prototype for 's3c_camif_gpio_get' [-Wmissing-prototypes] 28 | int s3c_camif_gpio_get(void) arch/arm/mach-s3c24xx/setup-camif.c:56:6: warning: no previous prototype for 's3c_camif_gpio_put' [-Wmissing-prototypes] 56 | void s3c_camif_gpio_put(void) Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org> --- Changes since v1: 1. New patch --- arch/arm/mach-s3c24xx/setup-camif.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)