浏览代码

[media] fimc-is-param: get rid of warnings

In file included from drivers/media/platform/exynos4-is/fimc-is-param.c:31:0:
drivers/media/platform/exynos4-is/fimc-is-errno.h:245:20: warning: type qualifiers ignored on function return type [-Wignored-qualifiers]
 const char * const fimc_is_strerr(unsigned int error);
                    ^
drivers/media/platform/exynos4-is/fimc-is-errno.h:246:20: warning: type qualifiers ignored on function return type [-Wignored-qualifiers]
 const char * const fimc_is_param_strerr(unsigned int error);
                    ^
drivers/media/platform/exynos4-is/fimc-is-param.c: In function 'fimc_is_set_initial_params':
drivers/media/platform/exynos4-is/fimc-is-param.c:670:23: warning: variable 'sensor' set but not used [-Wunused-but-set-variable]
  struct sensor_param *sensor;
                       ^

Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
Mauro Carvalho Chehab 11 年之前
父节点
当前提交
2ff1d4c13b

+ 2 - 2
drivers/media/platform/exynos4-is/fimc-is-errno.c

@@ -15,7 +15,7 @@
 
 
 #include "fimc-is-errno.h"
 #include "fimc-is-errno.h"
 
 
-const char * const fimc_is_param_strerr(unsigned int error)
+const char *fimc_is_param_strerr(unsigned int error)
 {
 {
 	switch (error) {
 	switch (error) {
 	case ERROR_COMMON_CMD:
 	case ERROR_COMMON_CMD:
@@ -146,7 +146,7 @@ const char * const fimc_is_param_strerr(unsigned int error)
 	}
 	}
 }
 }
 
 
-const char * const fimc_is_strerr(unsigned int error)
+const char *fimc_is_strerr(unsigned int error)
 {
 {
 	error &= ~IS_ERROR_TIME_OUT_FLAG;
 	error &= ~IS_ERROR_TIME_OUT_FLAG;
 
 

+ 2 - 2
drivers/media/platform/exynos4-is/fimc-is-errno.h

@@ -242,7 +242,7 @@ enum fimc_is_error {
 	ERROR_SCALER_FLIP				= 521,
 	ERROR_SCALER_FLIP				= 521,
 };
 };
 
 
-const char * const fimc_is_strerr(unsigned int error);
-const char * const fimc_is_param_strerr(unsigned int error);
+const char *fimc_is_strerr(unsigned int error);
+const char *fimc_is_param_strerr(unsigned int error);
 
 
 #endif /* FIMC_IS_ERR_H_ */
 #endif /* FIMC_IS_ERR_H_ */

+ 0 - 2
drivers/media/platform/exynos4-is/fimc-is-param.c

@@ -667,7 +667,6 @@ void __is_set_fd_config_orientation_val(struct fimc_is *is, u32 val)
 void fimc_is_set_initial_params(struct fimc_is *is)
 void fimc_is_set_initial_params(struct fimc_is *is)
 {
 {
 	struct global_param *global;
 	struct global_param *global;
-	struct sensor_param *sensor;
 	struct isp_param *isp;
 	struct isp_param *isp;
 	struct drc_param *drc;
 	struct drc_param *drc;
 	struct fd_param *fd;
 	struct fd_param *fd;
@@ -676,7 +675,6 @@ void fimc_is_set_initial_params(struct fimc_is *is)
 
 
 	index = is->config_index;
 	index = is->config_index;
 	global = &is->config[index].global;
 	global = &is->config[index].global;
-	sensor = &is->config[index].sensor;
 	isp = &is->config[index].isp;
 	isp = &is->config[index].isp;
 	drc = &is->config[index].drc;
 	drc = &is->config[index].drc;
 	fd = &is->config[index].fd;
 	fd = &is->config[index].fd;