Skip to contentSkip to conversation

linux-next: build failure after merge of the v4l-dvb-next tree

PATCH Stephen Rothwell 2 participants 2 messages Sep 20, 2021

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

Hi all,

After merging the v4l-dvb-next tree, today's linux-next build (x86_64 allmodconfig) failed like this:

drivers/media/rc/ir_toy.c: In function 'irtoy_tx':
drivers/media/rc/ir_toy.c:332:36: error: 'STATE_RESET' undeclared (first use in this function)
332 | sizeof(COMMAND_SMODE_EXIT), STATE_RESET);
| ^~~~~~~~~~~
drivers/media/rc/ir_toy.c:332:36: note: each undeclared identifier is reported only once for each function it appears in

Caused by commit

6a014f20734d ("media: ir_toy: allow tx carrier to be set")

interacting with commit

f0c15b360fb6 ("media: ir_toy: prevent device from hanging during transmit")

from the v4l-vdb-fixes tree.

I have applied the following merge fix patch for today.

From: Stephen Rothwell <[email protected]>
Date: Mon, 20 Sep 2021 10:14:37 +1000
Subject: [PATCH] fix for "media: ir_toy: allow tx carrier to be set"

---
 drivers/media/rc/ir_toy.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/media/rc/ir_toy.c +1 -1
index 9ea91d418635..71aced52248f 100644
@@ -329,7 +329,7 @@ static int irtoy_tx(struct rc_dev *rc, uint *txbuf, uint count)
 	// with its led on. It does not respond to any command when this
 	// happens. To work around this, re-enter sample mode.
 	err = irtoy_command(irtoy, COMMAND_SMODE_EXIT,
-			    sizeof(COMMAND_SMODE_EXIT), STATE_RESET);
+			    sizeof(COMMAND_SMODE_EXIT), STATE_COMMAND_NO_RESP);
 	if (err) {
 		dev_err(irtoy->dev, "exit sample mode: %d\n", err);
 		return err;
Signature · 5 lines
2.32.0

-- 
Cheers,
Stephen Rothwell
maintainer
#1 lore raw

Hi Mauro,

Quoted 11 lines · Stephen Rothwell

Hi all,

After merging the v4l-dvb-next tree, today's linux-next build (x86_64 allmodconfig) failed like this:

drivers/media/rc/ir_toy.c: In function 'irtoy_tx':
drivers/media/rc/ir_toy.c:332:36: error: 'STATE_RESET' undeclared (first use in this function)
332 | sizeof(COMMAND_SMODE_EXIT), STATE_RESET);
| ^~~~~~~~~~~
drivers/media/rc/ir_toy.c:332:36: note: each undeclared identifier is reported only once for each function it appears in

Quoted 3 lines

Caused by commit

6a014f20734d ("media: ir_toy: allow tx carrier to be set")

This commit renames STATE_RESET to STATE_COMMAND_NO_RESP.

Quoted 3 lines

interacting with commit

f0c15b360fb6 ("media: ir_toy: prevent device from hanging during transmit")

This commit uses STATE_RESET.

Quoted 3 lines

from the v4l-vdb-fixes tree.

I have applied the following merge fix patch for today.

I'm not sure what the best solution is here. Once commit f0c15b360fb6 makes it into Linus' tree and then is merged back into mediastage, commit 6a014f20734d can be rebased.

Thanks
Sean

Quoted 29 lines

From: Stephen Rothwell <[email protected]>
Date: Mon, 20 Sep 2021 10:14:37 +1000
Subject: [PATCH] fix for "media: ir_toy: allow tx carrier to be set"

---
 drivers/media/rc/ir_toy.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/media/rc/ir_toy.c +1 -1
index 9ea91d418635..71aced52248f 100644
@@ -329,7 +329,7 @@ static int irtoy_tx(struct rc_dev *rc, uint *txbuf, uint count)
 	// with its led on. It does not respond to any command when this
 	// happens. To work around this, re-enter sample mode.
 	err = irtoy_command(irtoy, COMMAND_SMODE_EXIT,
-			    sizeof(COMMAND_SMODE_EXIT), STATE_RESET);
+			    sizeof(COMMAND_SMODE_EXIT), STATE_COMMAND_NO_RESP);
 	if (err) {
 		dev_err(irtoy->dev, "exit sample mode: %d\n", err);
 		return err;
Signature · 5 lines
2.32.0

-- 
Cheers,
Stephen Rothwell