From 343e331b35ba443906a912eaea18feb2a6a4ec21 Mon Sep 17 00:00:00 2001 From: Dongjin Kim Date: Tue, 24 Feb 2026 18:16:40 +0900 Subject: [PATCH] ODROID-M1: cif/cpature: fix compile error 'conflicting types' MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit drivers/media/platform/rockchip/cif/capture.c:4983:6: error: conflicting types for ‘rkcif_do_stop_stream’ due to enum/integer mismatch; have ‘void(struct rkcif_stream *, unsigned int)’ [-Werror=enum-int-mismatch] 4983 | void rkcif_do_stop_stream(struct rkcif_stream *stream, | ^~~~~~~~~~~~~~~~~~~~ In file included from /opt/source/drivers/media/platform/rockchip/cif/capture.c:24: drivers/media/platform/rockchip/cif/dev.h:934:6: note: previous declaration of ‘rkcif_do_stop_stream’ with type ‘void(struct rkcif_stream *, enum rkcif_stream_mode)’ 934 | void rkcif_do_stop_stream(struct rkcif_stream *stream, | ^~~~~~~~~~~~~~~~~~~~ drivers/media/platform/rockchip/cif/capture.c:6163:5: error: conflicting types for ‘rkcif_do_start_stream’ due to enum/integer mismatch; have ‘int(struct rkcif_stream *, unsigned int)’ [-Werror=enum-int-mismatch] 6163 | int rkcif_do_start_stream(struct rkcif_stream *stream, unsigned int mode) | ^~~~~~~~~~~~~~~~~~~~~ drivers/media/platform/rockchip/cif/dev.h:932:5: note: previous declaration of ‘rkcif_do_start_stream’ with type ‘int(struct rkcif_stream *, enum rkcif_stream_mode)’ 932 | int rkcif_do_start_stream(struct rkcif_stream *stream, | ^~~~~~~~~~~~~~~~~~~~~ Signed-off-by: Dongjin Kim Change-Id: Ib62dc062f7c713b69304e0333ce4b1a373121e45 --- drivers/media/platform/rockchip/cif/capture.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/media/platform/rockchip/cif/capture.c b/drivers/media/platform/rockchip/cif/capture.c index dfa9d8ed5d5d..f430ff2c1900 100644 --- a/drivers/media/platform/rockchip/cif/capture.c +++ b/drivers/media/platform/rockchip/cif/capture.c @@ -4981,7 +4981,7 @@ static void rkcif_detach_sync_mode(struct rkcif_device *cif_dev) } void rkcif_do_stop_stream(struct rkcif_stream *stream, - unsigned int mode) + enum rkcif_stream_mode mode) { struct rkcif_vdev_node *node = &stream->vnode; struct rkcif_device *dev = stream->cifdev; @@ -6160,7 +6160,8 @@ static void rkcif_attach_sync_mode(struct rkcif_device *cifdev) static void rkcif_monitor_reset_event(struct rkcif_device *dev); -int rkcif_do_start_stream(struct rkcif_stream *stream, unsigned int mode) +int rkcif_do_start_stream(struct rkcif_stream *stream, + enum rkcif_stream_mode mode) { struct rkcif_vdev_node *node = &stream->vnode; struct rkcif_device *dev = stream->cifdev;