Commit b18869ba authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab
Browse files

media: digitv: use the newer dvb-usb macros for USB device 

In order to make the drivers under dvb-usb more homogeneous,
use the new macro.

Link: https://lore.kernel.org/linux-media/68de8820a361e61c25bf7402acac71b3770ff906.1648499509.git.mchehab@kernel.org


Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@kernel.org>
parent 671cae46

drivers/media/usb/dvb-usb/digitv.c

+9 −4
Original line number Diff line number Diff line
@@ -291,10 +291,15 @@ static int digitv_probe(struct usb_interface *intf, 
	return ret;

}



enum {

	ANCHOR_NEBULA_DIGITV,

};



static struct usb_device_id digitv_table[] = {

		{ USB_DEVICE(USB_VID_ANCHOR, USB_PID_NEBULA_DIGITV) },

		{ }		/* Terminating entry */

	DVB_USB_DEV(ANCHOR, ANCHOR_NEBULA_DIGITV),

	{ }

};



MODULE_DEVICE_TABLE (usb, digitv_table);



static struct dvb_usb_device_properties digitv_properties = {
@@ -343,7 +348,7 @@ static struct dvb_usb_device_properties digitv_properties = { 
	.num_device_descs = 1,

	.devices = {

		{   "Nebula Electronics uDigiTV DVB-T USB2.0)",

			{ &digitv_table[0], NULL },

			{ &digitv_table[ANCHOR_NEBULA_DIGITV], NULL },

			{ NULL },

		},

		{ NULL },

include/media/dvb-usb-ids.h

+1 −1
Original line number Diff line number Diff line
@@ -104,6 +104,7 @@ 
#define USB_PID_AFATECH_AF9035_9035			0x9035

#define USB_PID_ALINK_DTU				0xf170

#define USB_PID_AME_DTV5100				0xa232

#define USB_PID_ANCHOR_NEBULA_DIGITV			0x0201

#define USB_PID_ANSONIC_DVBT_USB			0x6000

#define USB_PID_ANYSEE					0x861f

#define USB_PID_ARTEC_T14BR				0x810f
@@ -301,7 +302,6 @@ 
#define USB_PID_MYGICA_T230C2				0xc68a

#define USB_PID_MYGICA_T230C2_LITE			0xc69a

#define USB_PID_MYGICA_T230C_LITE			0xc699

#define USB_PID_NEBULA_DIGITV				0x0201

#define USB_PID_NOXON_DAB_STICK 			0x00b3

#define USB_PID_NOXON_DAB_STICK_REV2			0x00e0

#define USB_PID_NOXON_DAB_STICK_REV3			0x00b4