[2/2] em28xx-dvb: fix DVB adapter device name

Message ID 973f454413c31ba5b6464c289ee24b01465abaff.1708422122.git.mchehab@kernel.org
State New
Headers
Series Add some uevent variables on DVB to support persistent names on udev |

Commit Message

Mauro Carvalho Chehab Feb. 20, 2024, 9:46 a.m. UTC
  This will be used for uevent, so it needs to be filled with the
device name, and not with it's parent ID.

Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
---
 drivers/media/usb/em28xx/em28xx-dvb.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
  

Comments

Hans Verkuil Feb. 26, 2024, 9:03 a.m. UTC | #1
Hi Mauro,

On 20/02/2024 10:46, Mauro Carvalho Chehab wrote:
> This will be used for uevent, so it needs to be filled with the
> device name, and not with it's parent ID.
> 
> Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
> ---
>  drivers/media/usb/em28xx/em28xx-dvb.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/media/usb/em28xx/em28xx-dvb.c b/drivers/media/usb/em28xx/em28xx-dvb.c
> index 9fce59979e3b..759c04fbd8cf 100644
> --- a/drivers/media/usb/em28xx/em28xx-dvb.c
> +++ b/drivers/media/usb/em28xx/em28xx-dvb.c
> @@ -980,7 +980,7 @@ static int em28xx_register_dvb(struct em28xx_dvb *dvb, struct module *module,
>  
>  	/* register adapter */
>  	result = dvb_register_adapter(&dvb->adapter,
> -				      dev_name(&dev->intf->dev), module,
> +				      em28xx_boards[dev->model].name, module,

It is not clear what the 'adapter name' should be: looking at how this is
used today it is either the name of the card or the name of the driver module
(KBUILD_MODNAME or a hardcoded string).

This driver appears to be the only one that uses dev_name, but I did not
do an exhaustive search, so there may be more.

In any case, I think this should be consistent and documented somewhere.

Personally, I think using the model/card name would be best.

But how does this relate to the name reported by FE_GET_INFO? Is it
supposed to be the same name? Is that handled correctly or documented
somewhere?

Regards,

	Hans

>  				      device, adapter_nr);
>  	if (result < 0) {
>  		dev_warn(&dev->intf->dev,
  

Patch

diff --git a/drivers/media/usb/em28xx/em28xx-dvb.c b/drivers/media/usb/em28xx/em28xx-dvb.c
index 9fce59979e3b..759c04fbd8cf 100644
--- a/drivers/media/usb/em28xx/em28xx-dvb.c
+++ b/drivers/media/usb/em28xx/em28xx-dvb.c
@@ -980,7 +980,7 @@  static int em28xx_register_dvb(struct em28xx_dvb *dvb, struct module *module,
 
 	/* register adapter */
 	result = dvb_register_adapter(&dvb->adapter,
-				      dev_name(&dev->intf->dev), module,
+				      em28xx_boards[dev->model].name, module,
 				      device, adapter_nr);
 	if (result < 0) {
 		dev_warn(&dev->intf->dev,