Re: [PATCH] cx18: Declare MODULE_FIRMWARE usage

[Andy Walls <awalls@xxxxxxxxxxxxxxxx>]

On Thu, 2012-07-26 at 11:05 -0600, Tim Gardner wrote:
> Cc: Andy Walls <awalls@xxxxxxxxxxxxxxxx>
> Cc: Mauro Carvalho Chehab <mchehab@xxxxxxxxxxxxx>
> Cc: ivtv-devel@xxxxxxxxxxxxxx
> Cc: linux-media@xxxxxxxxxxxxxxx
> Signed-off-by: Tim Gardner <tim.gardner@xxxxxxxxxxxxx>

You missed v4l-cx23418-dig.fw, in cx18-av-firmware.c, which is required
by all CX23418 devices.

You missed dvb-cx18-mpc718-mt352.fw, in cx18-dvb.c, which is only needed
by certain variants of the Yuan MPC-718 mini-PCI card.

In cx18, the dvb-cx18-mpc718-mt352.fw need not exist for all common
CX23418 based cards.  I would not want anything in user space or the
kernel to prevent module load, if this file does not exist.  This
firmware file is especially a pain, since it has to be snipped out of a
Windows driver binary.  Most users will not have it.

Regards,
Andy
> ---
>  drivers/media/video/cx18/cx18-driver.c   |    1 +
>  drivers/media/video/cx18/cx18-firmware.c |   10 ++++++++--
>  2 files changed, 9 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/media/video/cx18/cx18-driver.c b/drivers/media/video/cx18/cx18-driver.c
> index 7e5ffd6..c67733d 100644
> --- a/drivers/media/video/cx18/cx18-driver.c
> +++ b/drivers/media/video/cx18/cx18-driver.c
> @@ -1357,3 +1357,4 @@ static void __exit module_cleanup(void)
>  
>  module_init(module_start);
>  module_exit(module_cleanup);
> +MODULE_FIRMWARE(XC2028_DEFAULT_FIRMWARE);
> diff --git a/drivers/media/video/cx18/cx18-firmware.c b/drivers/media/video/cx18/cx18-firmware.c
> index b85c292..a1c1cec 100644
> --- a/drivers/media/video/cx18/cx18-firmware.c
> +++ b/drivers/media/video/cx18/cx18-firmware.c
> @@ -376,6 +376,9 @@ void cx18_init_memory(struct cx18 *cx)
>  	cx18_write_reg(cx, 0x00000101, CX18_WMB_CLIENT14);  /* AVO */
>  }
>  
> +#define CX18_CPU_FIRMWARE "v4l-cx23418-cpu.fw"
> +#define CX18_APU_FIRMWARE "v4l-cx23418-apu.fw"
> +
>  int cx18_firmware_init(struct cx18 *cx)
>  {
>  	u32 fw_entry_addr;
> @@ -400,7 +403,7 @@ int cx18_firmware_init(struct cx18 *cx)
>  	cx18_sw1_irq_enable(cx, IRQ_CPU_TO_EPU | IRQ_APU_TO_EPU);
>  	cx18_sw2_irq_enable(cx, IRQ_CPU_TO_EPU_ACK | IRQ_APU_TO_EPU_ACK);
>  
> -	sz = load_cpu_fw_direct("v4l-cx23418-cpu.fw", cx->enc_mem, cx);
> +	sz = load_cpu_fw_direct(CX18_CPU_FIRMWARE, cx->enc_mem, cx);
>  	if (sz <= 0)
>  		return sz;
>  
> @@ -408,7 +411,7 @@ int cx18_firmware_init(struct cx18 *cx)
>  	cx18_init_scb(cx);
>  
>  	fw_entry_addr = 0;
> -	sz = load_apu_fw_direct("v4l-cx23418-apu.fw", cx->enc_mem, cx,
> +	sz = load_apu_fw_direct(CX18_APU_FIRMWARE, cx->enc_mem, cx,
>  				&fw_entry_addr);
>  	if (sz <= 0)
>  		return sz;
> @@ -451,3 +454,6 @@ int cx18_firmware_init(struct cx18 *cx)
>  	cx18_write_reg_expect(cx, 0x14001400, 0xc78110, 0x00001400, 0x14001400);
>  	return 0;
>  }
> +
> +MODULE_FIRMWARE(CX18_CPU_FIRMWARE);
> +MODULE_FIRMWARE(CX18_APU_FIRMWARE);


--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/