Skip to contentSkip to conversation

ipu3-imgu: Fix compiler warnings

PATCH In review Sakari Ailus 2 participants 2 messages Dec 10, 2018 – Dec 11, 2018

Subsystems (3)
Media (V4L/DVB) Staging Intel IPU3 CSI-2 imgu driver
lore
Share & tools
lore

Sakari Ailus

author maintainer
#0 lore raw

PATCH 1/1 ipu3-imgu: Fix compiler warnings

Address a few false positive compiler warnings related to uninitialised variables. While at it, use bool where bool is needed and %u to print an unsigned integer.

Signed-off-by Sakari Ailus <[email protected]>
---
 drivers/staging/media/ipu3/ipu3.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/staging/media/ipu3/ipu3.c +4 -4
index b7886edeb01b7..d521b3afb8b1a 100644
@@ -228,7 +228,6 @@ int imgu_queue_buffers(struct imgu_device *imgu, bool initial, unsigned int pipe
 {
 	unsigned int node;
 	int r = 0;
-	struct imgu_buffer *ibuf;
 	struct imgu_media_pipe *imgu_pipe = &imgu->imgu_pipe[pipe];
 
 	if (!ipu3_css_is_streaming(&imgu->css))

@@ -250,7 +249,8 @@ int imgu_queue_buffers(struct imgu_device *imgu, bool initial, unsigned int pipe
 		} else if (imgu_pipe->queue_enabled[node]) {
 			struct ipu3_css_buffer *buf =
 				imgu_queue_getbuf(imgu, node, pipe);
-			int dummy;
+			struct imgu_buffer *ibuf = NULL;
+			bool dummy;
 
 			if (!buf)
 				break;

@@ -263,7 +263,7 @@ int imgu_queue_buffers(struct imgu_device *imgu, bool initial, unsigned int pipe
 				ibuf = container_of(buf, struct imgu_buffer,
 						    css_buf);
 			dev_dbg(&imgu->pci_dev->dev,
-				"queue %s %s buffer %d to css da: 0x%08x\n",
+				"queue %s %s buffer %u to css da: 0x%08x\n",
 				dummy ? "dummy" : "user",
 				imgu_node_map[node].name,
 				dummy ? 0 : ibuf->vid_buf.vbb.vb2_buf.index,

@@ -479,7 +479,7 @@ static irqreturn_t imgu_isr_threaded(int irq, void *imgu_ptr)
 	do {
 		u64 ns = ktime_get_ns();
 		struct ipu3_css_buffer *b;
-		struct imgu_buffer *buf;
+		struct imgu_buffer *buf = NULL;
 		unsigned int node, pipe;
 		bool dummy;
Signature · 1 line
2.11.0
Reviewed-by on v1 1/1
#1 lore raw

Hi Sakari,

Quoted 42 lines · Sakari Ailus

Address a few false positive compiler warnings related to uninitialised variables. While at it, use bool where bool is needed and %u to print an unsigned integer.

Signed-off-by Sakari Ailus <[email protected]>
---
 drivers/staging/media/ipu3/ipu3.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/staging/media/ipu3/ipu3.c +3 -3
index b7886edeb01b7..d521b3afb8b1a 100644
@@ -228,7 +228,6 @@ int imgu_queue_buffers(struct imgu_device *imgu, bool initial, unsigned int pipe
 {
        unsigned int node;
        int r = 0;
-       struct imgu_buffer *ibuf;
        struct imgu_media_pipe *imgu_pipe = &imgu->imgu_pipe[pipe];
 
        if (!ipu3_css_is_streaming(&imgu->css))

@@ -250,7 +249,8 @@ int imgu_queue_buffers(struct imgu_device *imgu, bool initial, unsigned int pipe
                } else if (imgu_pipe->queue_enabled[node]) {
                        struct ipu3_css_buffer *buf =
                                imgu_queue_getbuf(imgu, node, pipe);
-                       int dummy;
+                       struct imgu_buffer *ibuf = NULL;
+                       bool dummy;
 
                        if (!buf)
                                break;

@@ -263,7 +263,7 @@ int imgu_queue_buffers(struct imgu_device *imgu, bool initial, unsigned int pipe
                                ibuf = container_of(buf, struct imgu_buffer,
                                                    css_buf);
                        dev_dbg(&imgu->pci_dev->dev,
-                               "queue %s %s buffer %d to css da: 0x%08x\n",
+                               "queue %s %s buffer %u to css da: 0x%08x\n",
                                dummy ? "dummy" : "user",
                                imgu_node_map[node].name,
                                dummy ? 0 : ibuf->vid_buf.vbb.vb2_buf.index,

drivers/staging/media/ipu3/ipu3.c static irqreturn_t imgu_isr_threaded(int irq, void *imgu_ptr) · line 484

Quoted 7 lines
drivers/staging/media/ipu3/ipu3.c +1 -1
@@ -479,7 +479,7 @@ static irqreturn_t imgu_isr_threaded(int irq, void *imgu_ptr)
        do {
                u64 ns = ktime_get_ns();
                struct ipu3_css_buffer *b;
-               struct imgu_buffer *buf;
+               struct imgu_buffer *buf = NULL;
                unsigned int node, pipe;
                bool dummy;
Reviewed-by Tomasz Figa <[email protected]>

Both cases look very straightforward, I wonder why they triggered those false positives...

Best regards,
Tomasz