Re: [PATCH] media: av7110: Workaround a compiler warning

From: Hans Verkuil
Date: Fri Jun 20 2025 - 09:33:34 EST


Hi Stefan,

On 26/04/2025 23:54, Stefan Herdler wrote:
> Avoid compiler warning caused by an empty block statement.
>
> Signed-off-by: Stefan Herdler <herdler@xxxxxxxxxxxxxx>
> Reported-by: kernel test robot <lkp@xxxxxxxxx>
> Closes: https://lore.kernel.org/oe-kbuild-all/202504262127.FkkWHzfs-lkp@xxxxxxxxx/
> ---
>
> I could not reproduce this warning with gcc10 here, but I already had similar
> warnings with gcc12 on other projects.
> I think it has most probably been triggered by the empty block statement.
>
> I'm pretty confident this patch will fix the warning, but not 100% sure.
>
> The kernel test robot will pick this patch and test is anyway, if I'm correct.
> Let's wait, if it complains again.
> That's the best I can do right now.

Is this patch still needed? I noticed that it wasn't CC-ed to the linux-media
mailinglist, so it never appeared in patchwork, and was never picked up.

If it is still needed, then please post it to linux-media and it will be
picked up for v6.17.

Regards,

Hans

>
> Regards
> Stefan
>
>
> drivers/staging/media/av7110/av7110.c | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/staging/media/av7110/av7110.c b/drivers/staging/media/av7110/av7110.c
> index bc9a2a40a..962536ed7 100644
> --- a/drivers/staging/media/av7110/av7110.c
> +++ b/drivers/staging/media/av7110/av7110.c
> @@ -159,7 +159,7 @@ static void init_av7110_av(struct av7110 *av7110)
> * some special handling for the Siemens DVB-C cards...
> */
> } else if (av7110_init_analog_module(av7110) == 0) {
> - /* done. */
> + goto init_skip_analog_module;
> } else if (dev->pci->subsystem_vendor == 0x110a) {
> pr_info("DVB-C w/o analog module @ card %d detected\n", av7110->dvb_adapter.num);
> av7110->adac_type = DVB_ADAC_NONE;
> @@ -168,6 +168,7 @@ static void init_av7110_av(struct av7110 *av7110)
> pr_info("adac type set to %d @ card %d\n", av7110->adac_type, av7110->dvb_adapter.num);
> }
>
> +init_skip_analog_module:
> if (av7110->adac_type == DVB_ADAC_NONE || av7110->adac_type == DVB_ADAC_MSP34x0) {
> // switch DVB SCART on
> ret = av7110_fw_cmd(av7110, COMTYPE_AUDIODAC, MainSwitch, 1, 0);