shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-05 18:41:58 +09:00
Code Issues Packages Projects Releases Wiki Activity

ODROID-M1: cif/cpature: fix compile error 'conflicting types'

Browse Source 
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 <tobetter@gmail.com>
Change-Id: Ib62dc062f7c713b69304e0333ce4b1a373121e45
This commit is contained in:
Dongjin Kim
2026-02-24 18:16:40 +09:00
parent 46923fd293
commit 343e331b35
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/media/platform/rockchip/cif/capture.c
View File

@@ -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;