Eric Lee / linux-smarc-t335x-v3.2

Download as
Browse Code ยป

Commit 841a3f0de9a55682d33aa8bf770ff4f7cbb7e5da

Authored by Michael Krufky
Committed by Mauro Carvalho Chehab
1 parent dba843afad
Exists in master and in 4 other branches v3.2_AM335xPSP_04.06.00.11, v3.2_NEWT335xPSP_04.06.00.11, v3.2_SBC_SMARTMEN, v3.2_SMARCT335xPSP_04.06.00.11

V4L/DVB (10749): sms1xxx: move smsusb_id_table into smsusb.c 

Move the usb_device_id table to the smsusb module in preparation for the
sms1xxx module to be split into sub-modules. This will allow the smsusb
driver to start up automatically upon insertion of the USB device.

Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

Showing 3 changed files with 47 additions and 49 deletions Side-by-side Diff

drivers/media/dvb/siano/sms-cards.c
Diff comments   View file @ 841a3f0
... ... @@ -19,53 +19,6 @@
19 19  
20 20 #include "sms-cards.h"
21 21  
22   -struct usb_device_id smsusb_id_table[] = {
23   -#ifdef CONFIG_DVB_SIANO_SMS1XXX_SMS_IDS
24   - { USB_DEVICE(0x187f, 0x0010),
25   - .driver_info = SMS1XXX_BOARD_SIANO_STELLAR },
26   - { USB_DEVICE(0x187f, 0x0100),
27   - .driver_info = SMS1XXX_BOARD_SIANO_STELLAR },
28   - { USB_DEVICE(0x187f, 0x0200),
29   - .driver_info = SMS1XXX_BOARD_SIANO_NOVA_A },
30   - { USB_DEVICE(0x187f, 0x0201),
31   - .driver_info = SMS1XXX_BOARD_SIANO_NOVA_B },
32   - { USB_DEVICE(0x187f, 0x0300),
33   - .driver_info = SMS1XXX_BOARD_SIANO_VEGA },
34   -#endif
35   - { USB_DEVICE(0x2040, 0x1700),
36   - .driver_info = SMS1XXX_BOARD_HAUPPAUGE_CATAMOUNT },
37   - { USB_DEVICE(0x2040, 0x1800),
38   - .driver_info = SMS1XXX_BOARD_HAUPPAUGE_OKEMO_A },
39   - { USB_DEVICE(0x2040, 0x1801),
40   - .driver_info = SMS1XXX_BOARD_HAUPPAUGE_OKEMO_B },
41   - { USB_DEVICE(0x2040, 0x2000),
42   - .driver_info = SMS1XXX_BOARD_HAUPPAUGE_TIGER_MINICARD },
43   - { USB_DEVICE(0x2040, 0x2009),
44   - .driver_info = SMS1XXX_BOARD_HAUPPAUGE_TIGER_MINICARD_R2 },
45   - { USB_DEVICE(0x2040, 0x200a),
46   - .driver_info = SMS1XXX_BOARD_HAUPPAUGE_TIGER_MINICARD },
47   - { USB_DEVICE(0x2040, 0x2010),
48   - .driver_info = SMS1XXX_BOARD_HAUPPAUGE_TIGER_MINICARD },
49   - { USB_DEVICE(0x2040, 0x2011),
50   - .driver_info = SMS1XXX_BOARD_HAUPPAUGE_TIGER_MINICARD },
51   - { USB_DEVICE(0x2040, 0x2019),
52   - .driver_info = SMS1XXX_BOARD_HAUPPAUGE_TIGER_MINICARD },
53   - { USB_DEVICE(0x2040, 0x5500),
54   - .driver_info = SMS1XXX_BOARD_HAUPPAUGE_WINDHAM },
55   - { USB_DEVICE(0x2040, 0x5510),
56   - .driver_info = SMS1XXX_BOARD_HAUPPAUGE_WINDHAM },
57   - { USB_DEVICE(0x2040, 0x5520),
58   - .driver_info = SMS1XXX_BOARD_HAUPPAUGE_WINDHAM },
59   - { USB_DEVICE(0x2040, 0x5530),
60   - .driver_info = SMS1XXX_BOARD_HAUPPAUGE_WINDHAM },
61   - { USB_DEVICE(0x2040, 0x5580),
62   - .driver_info = SMS1XXX_BOARD_HAUPPAUGE_WINDHAM },
63   - { USB_DEVICE(0x2040, 0x5590),
64   - .driver_info = SMS1XXX_BOARD_HAUPPAUGE_WINDHAM },
65   - { } /* Terminating entry */
66   -};
67   -MODULE_DEVICE_TABLE(usb, smsusb_id_table);
68   -
69 22 static struct sms_board sms_boards[] = {
70 23 [SMS_BOARD_UNKNOWN] = {
71 24 .name = "Unknown board",
drivers/media/dvb/siano/sms-cards.h
Diff comments   View file @ 841a3f0
... ... @@ -54,7 +54,5 @@
54 54 int sms_board_power(struct smscore_device_t *coredev, int onoff);
55 55 int sms_board_lna_control(struct smscore_device_t *coredev, int onoff);
56 56  
57   -extern struct usb_device_id smsusb_id_table[];
58   -
59 57 #endif /* __SMS_CARDS_H__ */
drivers/media/dvb/siano/smsusb.c
Diff comments   View file @ 841a3f0
... ... @@ -474,6 +474,53 @@
474 474 return 0;
475 475 }
476 476  
  477 +struct usb_device_id smsusb_id_table[] = {
  478 +#ifdef CONFIG_DVB_SIANO_SMS1XXX_SMS_IDS
  479 + { USB_DEVICE(0x187f, 0x0010),
  480 + .driver_info = SMS1XXX_BOARD_SIANO_STELLAR },
  481 + { USB_DEVICE(0x187f, 0x0100),
  482 + .driver_info = SMS1XXX_BOARD_SIANO_STELLAR },
  483 + { USB_DEVICE(0x187f, 0x0200),
  484 + .driver_info = SMS1XXX_BOARD_SIANO_NOVA_A },
  485 + { USB_DEVICE(0x187f, 0x0201),
  486 + .driver_info = SMS1XXX_BOARD_SIANO_NOVA_B },
  487 + { USB_DEVICE(0x187f, 0x0300),
  488 + .driver_info = SMS1XXX_BOARD_SIANO_VEGA },
  489 +#endif
  490 + { USB_DEVICE(0x2040, 0x1700),
  491 + .driver_info = SMS1XXX_BOARD_HAUPPAUGE_CATAMOUNT },
  492 + { USB_DEVICE(0x2040, 0x1800),
  493 + .driver_info = SMS1XXX_BOARD_HAUPPAUGE_OKEMO_A },
  494 + { USB_DEVICE(0x2040, 0x1801),
  495 + .driver_info = SMS1XXX_BOARD_HAUPPAUGE_OKEMO_B },
  496 + { USB_DEVICE(0x2040, 0x2000),
  497 + .driver_info = SMS1XXX_BOARD_HAUPPAUGE_TIGER_MINICARD },
  498 + { USB_DEVICE(0x2040, 0x2009),
  499 + .driver_info = SMS1XXX_BOARD_HAUPPAUGE_TIGER_MINICARD_R2 },
  500 + { USB_DEVICE(0x2040, 0x200a),
  501 + .driver_info = SMS1XXX_BOARD_HAUPPAUGE_TIGER_MINICARD },
  502 + { USB_DEVICE(0x2040, 0x2010),
  503 + .driver_info = SMS1XXX_BOARD_HAUPPAUGE_TIGER_MINICARD },
  504 + { USB_DEVICE(0x2040, 0x2011),
  505 + .driver_info = SMS1XXX_BOARD_HAUPPAUGE_TIGER_MINICARD },
  506 + { USB_DEVICE(0x2040, 0x2019),
  507 + .driver_info = SMS1XXX_BOARD_HAUPPAUGE_TIGER_MINICARD },
  508 + { USB_DEVICE(0x2040, 0x5500),
  509 + .driver_info = SMS1XXX_BOARD_HAUPPAUGE_WINDHAM },
  510 + { USB_DEVICE(0x2040, 0x5510),
  511 + .driver_info = SMS1XXX_BOARD_HAUPPAUGE_WINDHAM },
  512 + { USB_DEVICE(0x2040, 0x5520),
  513 + .driver_info = SMS1XXX_BOARD_HAUPPAUGE_WINDHAM },
  514 + { USB_DEVICE(0x2040, 0x5530),
  515 + .driver_info = SMS1XXX_BOARD_HAUPPAUGE_WINDHAM },
  516 + { USB_DEVICE(0x2040, 0x5580),
  517 + .driver_info = SMS1XXX_BOARD_HAUPPAUGE_WINDHAM },
  518 + { USB_DEVICE(0x2040, 0x5590),
  519 + .driver_info = SMS1XXX_BOARD_HAUPPAUGE_WINDHAM },
  520 + { } /* Terminating entry */
  521 +};
  522 +MODULE_DEVICE_TABLE(usb, smsusb_id_table);
  523 +
477 524 static struct usb_driver smsusb_driver = {
478 525 .name = "smsusb",
479 526 .probe = smsusb_probe,