From 0647eda30ca346069132e55c4a8675f976a906bf Mon Sep 17 00:00:00 2001 From: Cai YiWei Date: Fri, 12 Nov 2021 14:42:42 +0800 Subject: [PATCH] media: rockchip: isp: useless version return -EINVAL fix crash for CPU_XXX no define Change-Id: I4577c7b33823c258b0166378e96d0394b81f570e Signed-off-by: Cai YiWei --- drivers/media/platform/rockchip/isp/capture_v1x.h | 2 +- drivers/media/platform/rockchip/isp/capture_v2x.h | 4 ++-- drivers/media/platform/rockchip/isp/capture_v3x.h | 2 +- drivers/media/platform/rockchip/isp/isp_params_v1x.h | 2 +- drivers/media/platform/rockchip/isp/isp_params_v2x.h | 2 +- drivers/media/platform/rockchip/isp/isp_params_v3x.h | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/drivers/media/platform/rockchip/isp/capture_v1x.h b/drivers/media/platform/rockchip/isp/capture_v1x.h index a001e69c5a43..f26f1bde0010 100644 --- a/drivers/media/platform/rockchip/isp/capture_v1x.h +++ b/drivers/media/platform/rockchip/isp/capture_v1x.h @@ -9,7 +9,7 @@ int rkisp_register_stream_v1x(struct rkisp_device *dev); void rkisp_unregister_stream_v1x(struct rkisp_device *dev); void rkisp_mi_v1x_isr(u32 mis_val, struct rkisp_device *dev); #else -static inline int rkisp_register_stream_v1x(struct rkisp_device *dev) { return 0; } +static inline int rkisp_register_stream_v1x(struct rkisp_device *dev) { return -EINVAL; } static inline void rkisp_unregister_stream_v1x(struct rkisp_device *dev) {} static inline void rkisp_mi_v1x_isr(u32 mis_val, struct rkisp_device *dev) {} #endif diff --git a/drivers/media/platform/rockchip/isp/capture_v2x.h b/drivers/media/platform/rockchip/isp/capture_v2x.h index f3a58529a3db..8ec036998a4a 100644 --- a/drivers/media/platform/rockchip/isp/capture_v2x.h +++ b/drivers/media/platform/rockchip/isp/capture_v2x.h @@ -25,7 +25,7 @@ int rkisp_start_spstream(struct rkisp_stream *stream); void rkisp_stop_spstream(struct rkisp_stream *stream); void rkisp_update_spstream_buf(struct rkisp_stream *stream); #else -static inline int rkisp_register_stream_v20(struct rkisp_device *dev) { return 0; } +static inline int rkisp_register_stream_v20(struct rkisp_device *dev) { return -EINVAL; } static inline void rkisp_unregister_stream_v20(struct rkisp_device *dev) {} static inline void rkisp_mi_v20_isr(u32 mis_val, struct rkisp_device *dev) {} static inline void rkisp_mipi_v20_isr(u32 phy, u32 packet, u32 overflow, u32 state, struct rkisp_device *dev) {} @@ -39,7 +39,7 @@ void rkisp_unregister_stream_v21(struct rkisp_device *dev); void rkisp_mi_v21_isr(u32 mis_val, struct rkisp_device *dev); void rkisp_mipi_v21_isr(u32 phy, u32 packet, u32 overflow, u32 state, struct rkisp_device *dev); #else -static inline int rkisp_register_stream_v21(struct rkisp_device *dev) { return 0; } +static inline int rkisp_register_stream_v21(struct rkisp_device *dev) { return -EINVAL; } static inline void rkisp_unregister_stream_v21(struct rkisp_device *dev) {} static inline void rkisp_mi_v21_isr(u32 mis_val, struct rkisp_device *dev) {} static inline void rkisp_mipi_v21_isr(u32 phy, u32 packet, u32 overflow, u32 state, struct rkisp_device *dev) {} diff --git a/drivers/media/platform/rockchip/isp/capture_v3x.h b/drivers/media/platform/rockchip/isp/capture_v3x.h index c4bd2d0a8483..cb3d59391e87 100644 --- a/drivers/media/platform/rockchip/isp/capture_v3x.h +++ b/drivers/media/platform/rockchip/isp/capture_v3x.h @@ -14,7 +14,7 @@ void rkisp_unregister_stream_v30(struct rkisp_device *dev); void rkisp_mi_v30_isr(u32 mis_val, struct rkisp_device *dev); void rkisp_mipi_v30_isr(u32 phy, u32 packet, u32 overflow, u32 state, struct rkisp_device *dev); #else -static inline int rkisp_register_stream_v30(struct rkisp_device *dev) { return 0; } +static inline int rkisp_register_stream_v30(struct rkisp_device *dev) { return -EINVAL; } static inline void rkisp_unregister_stream_v30(struct rkisp_device *dev) {} static inline void rkisp_mi_v30_isr(u32 mis_val, struct rkisp_device *dev) {} static inline void rkisp_mipi_v30_isr(u32 phy, u32 packet, u32 overflow, u32 state, struct rkisp_device *dev) {} diff --git a/drivers/media/platform/rockchip/isp/isp_params_v1x.h b/drivers/media/platform/rockchip/isp/isp_params_v1x.h index 571d8ee399b6..316bef51eaca 100644 --- a/drivers/media/platform/rockchip/isp/isp_params_v1x.h +++ b/drivers/media/platform/rockchip/isp/isp_params_v1x.h @@ -80,7 +80,7 @@ struct rkisp_isp_params_v1x_config { int rkisp_init_params_vdev_v1x(struct rkisp_isp_params_vdev *params_vdev); void rkisp_uninit_params_vdev_v1x(struct rkisp_isp_params_vdev *params_vdev); #else -static inline int rkisp_init_params_vdev_v1x(struct rkisp_isp_params_vdev *params_vdev) { return 0; } +static inline int rkisp_init_params_vdev_v1x(struct rkisp_isp_params_vdev *params_vdev) { return -EINVAL; } static inline void rkisp_uninit_params_vdev_v1x(struct rkisp_isp_params_vdev *params_vdev) {} #endif diff --git a/drivers/media/platform/rockchip/isp/isp_params_v2x.h b/drivers/media/platform/rockchip/isp/isp_params_v2x.h index 132e0b867216..b35505ce230c 100644 --- a/drivers/media/platform/rockchip/isp/isp_params_v2x.h +++ b/drivers/media/platform/rockchip/isp/isp_params_v2x.h @@ -353,7 +353,7 @@ struct rkisp_isp_params_val_v2x { int rkisp_init_params_vdev_v2x(struct rkisp_isp_params_vdev *params_vdev); void rkisp_uninit_params_vdev_v2x(struct rkisp_isp_params_vdev *params_vdev); #else -static inline int rkisp_init_params_vdev_v2x(struct rkisp_isp_params_vdev *params_vdev) { return 0; } +static inline int rkisp_init_params_vdev_v2x(struct rkisp_isp_params_vdev *params_vdev) { return -EINVAL; } static inline void rkisp_uninit_params_vdev_v2x(struct rkisp_isp_params_vdev *params_vdev) {} #endif diff --git a/drivers/media/platform/rockchip/isp/isp_params_v3x.h b/drivers/media/platform/rockchip/isp/isp_params_v3x.h index abeb92fec119..0a5075ad4f58 100644 --- a/drivers/media/platform/rockchip/isp/isp_params_v3x.h +++ b/drivers/media/platform/rockchip/isp/isp_params_v3x.h @@ -199,7 +199,7 @@ struct rkisp_isp_params_val_v3x { int rkisp_init_params_vdev_v3x(struct rkisp_isp_params_vdev *params_vdev); void rkisp_uninit_params_vdev_v3x(struct rkisp_isp_params_vdev *params_vdev); #else -static inline int rkisp_init_params_vdev_v3x(struct rkisp_isp_params_vdev *params_vdev) { return 0; } +static inline int rkisp_init_params_vdev_v3x(struct rkisp_isp_params_vdev *params_vdev) { return -EINVAL; } static inline void rkisp_uninit_params_vdev_v3x(struct rkisp_isp_params_vdev *params_vdev) {} #endif