From: Daniel Wagner Date: Tue, 9 Feb 2016 09:18:32 +0000 (+0100) Subject: video: Use bool instead int pointer for get_opt_bool() argument X-Git-Tag: v4.1.50~90 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=77bff52c2c82d3b6c3ecb8f33b104f29a3edf732;p=users%2Fdwmw2%2Flinux.git video: Use bool instead int pointer for get_opt_bool() argument [ Upstream commit 206fc20598157ce15597822cf01b94377e30075b ] As the function name already indicates that get_opt_bool() parses for a bool. It is not a surprise that compiler is complaining about it when -Werror=incompatible-pointer-types is used: drivers/video/fbdev/intelfb/intelfbdrv.c: In function ‘intelfb_setup’: drivers/video/fbdev/intelfb/intelfbdrv.c:353:39: error: passing argument 3 of ‘get_opt_bool’ from incompatible pointer type [-Werror=incompatible-pointer-types] if (get_opt_bool(this_opt, "accel", &accel)) Signed-off-by: Daniel Wagner Reported-by: Fengguang Wu Signed-off-by: Tomi Valkeinen Signed-off-by: Sasha Levin --- diff --git a/drivers/video/fbdev/intelfb/intelfbdrv.c b/drivers/video/fbdev/intelfb/intelfbdrv.c index b847d530471a2..e8d1309ccefcf 100644 --- a/drivers/video/fbdev/intelfb/intelfbdrv.c +++ b/drivers/video/fbdev/intelfb/intelfbdrv.c @@ -306,7 +306,7 @@ static __inline__ int get_opt_int(const char *this_opt, const char *name, } static __inline__ int get_opt_bool(const char *this_opt, const char *name, - int *ret) + bool *ret) { if (!ret) return 0;