[media] dw2102: use the new USB ID Terratec Cinergy S2 macros
diff mbox

Message ID a561d768c13287ef156863c4ff149306844101fa.1453733377.git.mchehab@osg.samsung.com
State New
Headers show

Commit Message

Mauro Carvalho Chehab Jan. 25, 2016, 2:49 p.m. UTC
Now that this was defined at usb-id.h, update the values for
USB_PID_TERRATEC_CINERGY_S2_R1 and USB_PID_TERRATEC_CINERGY_S2_R2.

Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
---
 drivers/media/usb/dvb-usb/dw2102.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Comments

kbuild test robot Jan. 25, 2016, 3:14 p.m. UTC | #1
Hi Mauro,

[auto build test ERROR on linuxtv-media/master]
[also build test ERROR on v4.5-rc1 next-20160125]
[if your patch is applied to the wrong git tree, please drop us a note to help improving the system]

url:    https://github.com/0day-ci/linux/commits/Mauro-Carvalho-Chehab/dw2102-use-the-new-USB-ID-Terratec-Cinergy-S2-macros/20160125-225251
base:   git://linuxtv.org/media_tree.git master
config: x86_64-rhel (attached as .config)
reproduce:
        # save the attached .config to linux build tree
        make ARCH=x86_64 

All errors (new ones prefixed by >>):

   In file included from drivers/media/usb/dvb-usb/dvb-usb.h:14:0,
                    from drivers/media/usb/dvb-usb/dw2102.h:5,
                    from drivers/media/usb/dvb-usb/dw2102.c:15:
>> drivers/media/usb/dvb-usb/dw2102.c:1705:56: error: 'USB_PID_TERRATEC_CINERGY_S2_R1' undeclared here (not in a function)
     [TERRATEC_CINERGY_S2] = {USB_DEVICE(USB_VID_TERRATEC, USB_PID_TERRATEC_CINERGY_S2_R1)},
                                                           ^
   include/linux/usb.h:854:16: note: in definition of macro 'USB_DEVICE'
     .idProduct = (prod)
                   ^
>> drivers/media/usb/dvb-usb/dw2102.c:1711:59: error: 'USB_PID_TERRATEC_CINERGY_S2_R2' undeclared here (not in a function)
     [TERRATEC_CINERGY_S2_R2] = {USB_DEVICE(USB_VID_TERRATEC, USB_PID_TERRATEC_CINERGY_S2_R2)},
                                                              ^
   include/linux/usb.h:854:16: note: in definition of macro 'USB_DEVICE'
     .idProduct = (prod)
                   ^

vim +/USB_PID_TERRATEC_CINERGY_S2_R1 +1705 drivers/media/usb/dvb-usb/dw2102.c

  1699		[CYPRESS_DW3101] = {USB_DEVICE(USB_VID_CYPRESS, USB_PID_DW3101)},
  1700		[TEVII_S630] = {USB_DEVICE(0x9022, USB_PID_TEVII_S630)},
  1701		[PROF_1100] = {USB_DEVICE(0x3011, USB_PID_PROF_1100)},
  1702		[TEVII_S660] = {USB_DEVICE(0x9022, USB_PID_TEVII_S660)},
  1703		[PROF_7500] = {USB_DEVICE(0x3034, 0x7500)},
  1704		[GENIATECH_SU3000] = {USB_DEVICE(0x1f4d, 0x3000)},
> 1705		[TERRATEC_CINERGY_S2] = {USB_DEVICE(USB_VID_TERRATEC, USB_PID_TERRATEC_CINERGY_S2_R1)},
  1706		[TEVII_S480_1] = {USB_DEVICE(0x9022, USB_PID_TEVII_S480_1)},
  1707		[TEVII_S480_2] = {USB_DEVICE(0x9022, USB_PID_TEVII_S480_2)},
  1708		[X3M_SPC1400HD] = {USB_DEVICE(0x1f4d, 0x3100)},
  1709		[TEVII_S421] = {USB_DEVICE(0x9022, USB_PID_TEVII_S421)},
  1710		[TEVII_S632] = {USB_DEVICE(0x9022, USB_PID_TEVII_S632)},
> 1711		[TERRATEC_CINERGY_S2_R2] = {USB_DEVICE(USB_VID_TERRATEC, USB_PID_TERRATEC_CINERGY_S2_R2)},
  1712		[GOTVIEW_SAT_HD] = {USB_DEVICE(0x1FE1, USB_PID_GOTVIEW_SAT_HD)},
  1713		[GENIATECH_T220] = {USB_DEVICE(0x1f4d, 0xD220)},
  1714		[TECHNOTREND_S2_4600] = {USB_DEVICE(USB_VID_TECHNOTREND,

---
0-DAY kernel test infrastructure                Open Source Technology Center
https://lists.01.org/pipermail/kbuild-all                   Intel Corporation

Patch
diff mbox

diff --git a/drivers/media/usb/dvb-usb/dw2102.c b/drivers/media/usb/dvb-usb/dw2102.c
index 14ef25dc6cd3..bc19da5ad3b7 100644
--- a/drivers/media/usb/dvb-usb/dw2102.c
+++ b/drivers/media/usb/dvb-usb/dw2102.c
@@ -1702,13 +1702,13 @@  static struct usb_device_id dw2102_table[] = {
 	[TEVII_S660] = {USB_DEVICE(0x9022, USB_PID_TEVII_S660)},
 	[PROF_7500] = {USB_DEVICE(0x3034, 0x7500)},
 	[GENIATECH_SU3000] = {USB_DEVICE(0x1f4d, 0x3000)},
-	[TERRATEC_CINERGY_S2] = {USB_DEVICE(USB_VID_TERRATEC, 0x00a8)},
+	[TERRATEC_CINERGY_S2] = {USB_DEVICE(USB_VID_TERRATEC, USB_PID_TERRATEC_CINERGY_S2_R1)},
 	[TEVII_S480_1] = {USB_DEVICE(0x9022, USB_PID_TEVII_S480_1)},
 	[TEVII_S480_2] = {USB_DEVICE(0x9022, USB_PID_TEVII_S480_2)},
 	[X3M_SPC1400HD] = {USB_DEVICE(0x1f4d, 0x3100)},
 	[TEVII_S421] = {USB_DEVICE(0x9022, USB_PID_TEVII_S421)},
 	[TEVII_S632] = {USB_DEVICE(0x9022, USB_PID_TEVII_S632)},
-	[TERRATEC_CINERGY_S2_R2] = {USB_DEVICE(USB_VID_TERRATEC, 0x00b0)},
+	[TERRATEC_CINERGY_S2_R2] = {USB_DEVICE(USB_VID_TERRATEC, USB_PID_TERRATEC_CINERGY_S2_R2)},
 	[GOTVIEW_SAT_HD] = {USB_DEVICE(0x1FE1, USB_PID_GOTVIEW_SAT_HD)},
 	[GENIATECH_T220] = {USB_DEVICE(0x1f4d, 0xD220)},
 	[TECHNOTREND_S2_4600] = {USB_DEVICE(USB_VID_TECHNOTREND,