diff options
Diffstat (limited to 'drivers/media/pci/cx18/cx18-driver.c')
-rw-r--r-- | drivers/media/pci/cx18/cx18-driver.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/media/pci/cx18/cx18-driver.c b/drivers/media/pci/cx18/cx18-driver.c index 039133d692e3..613e5ae7d5ca 100644 --- a/drivers/media/pci/cx18/cx18-driver.c +++ b/drivers/media/pci/cx18/cx18-driver.c | |||
@@ -53,7 +53,7 @@ int (*cx18_ext_init)(struct cx18 *); | |||
53 | EXPORT_SYMBOL(cx18_ext_init); | 53 | EXPORT_SYMBOL(cx18_ext_init); |
54 | 54 | ||
55 | /* add your revision and whatnot here */ | 55 | /* add your revision and whatnot here */ |
56 | static struct pci_device_id cx18_pci_tbl[] __devinitdata = { | 56 | static struct pci_device_id cx18_pci_tbl[] = { |
57 | {PCI_VENDOR_ID_CX, PCI_DEVICE_ID_CX23418, | 57 | {PCI_VENDOR_ID_CX, PCI_DEVICE_ID_CX23418, |
58 | PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, | 58 | PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, |
59 | {0,} | 59 | {0,} |
@@ -691,7 +691,7 @@ done: | |||
691 | cx->card_i2c = cx->card->i2c; | 691 | cx->card_i2c = cx->card->i2c; |
692 | } | 692 | } |
693 | 693 | ||
694 | static int __devinit cx18_create_in_workq(struct cx18 *cx) | 694 | static int cx18_create_in_workq(struct cx18 *cx) |
695 | { | 695 | { |
696 | snprintf(cx->in_workq_name, sizeof(cx->in_workq_name), "%s-in", | 696 | snprintf(cx->in_workq_name, sizeof(cx->in_workq_name), "%s-in", |
697 | cx->v4l2_dev.name); | 697 | cx->v4l2_dev.name); |
@@ -703,7 +703,7 @@ static int __devinit cx18_create_in_workq(struct cx18 *cx) | |||
703 | return 0; | 703 | return 0; |
704 | } | 704 | } |
705 | 705 | ||
706 | static void __devinit cx18_init_in_work_orders(struct cx18 *cx) | 706 | static void cx18_init_in_work_orders(struct cx18 *cx) |
707 | { | 707 | { |
708 | int i; | 708 | int i; |
709 | for (i = 0; i < CX18_MAX_IN_WORK_ORDERS; i++) { | 709 | for (i = 0; i < CX18_MAX_IN_WORK_ORDERS; i++) { |
@@ -718,7 +718,7 @@ static void __devinit cx18_init_in_work_orders(struct cx18 *cx) | |||
718 | No assumptions on the card type may be made here (see cx18_init_struct2 | 718 | No assumptions on the card type may be made here (see cx18_init_struct2 |
719 | for that). | 719 | for that). |
720 | */ | 720 | */ |
721 | static int __devinit cx18_init_struct1(struct cx18 *cx) | 721 | static int cx18_init_struct1(struct cx18 *cx) |
722 | { | 722 | { |
723 | int ret; | 723 | int ret; |
724 | 724 | ||
@@ -775,7 +775,7 @@ static int __devinit cx18_init_struct1(struct cx18 *cx) | |||
775 | 775 | ||
776 | /* Second initialization part. Here the card type has been | 776 | /* Second initialization part. Here the card type has been |
777 | autodetected. */ | 777 | autodetected. */ |
778 | static void __devinit cx18_init_struct2(struct cx18 *cx) | 778 | static void cx18_init_struct2(struct cx18 *cx) |
779 | { | 779 | { |
780 | int i; | 780 | int i; |
781 | 781 | ||
@@ -892,8 +892,8 @@ static void cx18_init_subdevs(struct cx18 *cx) | |||
892 | cx->sd_extmux = cx18_find_hw(cx, cx->card->hw_muxer); | 892 | cx->sd_extmux = cx18_find_hw(cx, cx->card->hw_muxer); |
893 | } | 893 | } |
894 | 894 | ||
895 | static int __devinit cx18_probe(struct pci_dev *pci_dev, | 895 | static int cx18_probe(struct pci_dev *pci_dev, |
896 | const struct pci_device_id *pci_id) | 896 | const struct pci_device_id *pci_id) |
897 | { | 897 | { |
898 | int retval = 0; | 898 | int retval = 0; |
899 | int i; | 899 | int i; |