[PATCH] dvb: usb/pci: correct syntax of driver name fields

Change the name-field of the pci_driver and usb_driver structs to the name of
the module after compilation.  It seems that this field is used in some places
where special characters are not allowed.  Thanks to Alan Halverson for
finding this problem.

Signed-off-by: Patrick Boettcher <pb@linuxtv.org>
Signed-off-by: Johannes Stezenbach <js@linuxtv.org>
Cc: Greg KH <greg@kroah.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

diff --git a/drivers/media/dvb/b2c2/flexcop-pci.c b/drivers/media/dvb/b2c2/flexcop-pci.c
index a436d5584ea655162cb0bb91c9272c233db192dd..2f76eb3fea40c2d81d6a91ad310fd65e14134c8d 100644 (file)
--- a/drivers/media/dvb/b2c2/flexcop-pci.c
+++ b/drivers/media/dvb/b2c2/flexcop-pci.c
@@ -409,7 +409,7 @@ static struct pci_device_id flexcop_pci_tbl[] = {
 MODULE_DEVICE_TABLE(pci, flexcop_pci_tbl);
 
 static struct pci_driver flexcop_pci_driver = {
-       .name     = "Technisat/B2C2 FlexCop II/IIb PCI",
+       .name     = "b2c2_flexcop_pci",
        .id_table = flexcop_pci_tbl,
        .probe    = flexcop_pci_probe,
        .remove   = flexcop_pci_remove,

diff --git a/drivers/media/dvb/b2c2/flexcop-usb.c b/drivers/media/dvb/b2c2/flexcop-usb.c
index 0113449abd15107479b1722308309900f97bb0b5..0a78ba3737a58d85a64a7d902b30e9dfeeae4579 100644 (file)
--- a/drivers/media/dvb/b2c2/flexcop-usb.c
+++ b/drivers/media/dvb/b2c2/flexcop-usb.c
@@ -545,7 +545,7 @@ static struct usb_device_id flexcop_usb_table [] = {
 /* usb specific object needed to register this driver with the usb subsystem */
 static struct usb_driver flexcop_usb_driver = {
        .owner          = THIS_MODULE,
-       .name           = "Technisat/B2C2 FlexCop II/IIb/III USB",
+       .name           = "b2c2_flexcop_usb",
        .probe          = flexcop_usb_probe,
        .disconnect = flexcop_usb_disconnect,
        .id_table       = flexcop_usb_table,

diff --git a/drivers/media/dvb/dvb-usb/a800.c b/drivers/media/dvb/dvb-usb/a800.c
index 672037c22819c5dd31b3a9cbf111a6a101a820b3..f2fcc2f1f846114391ae66ddffebd89dec5027d8 100644 (file)
--- a/drivers/media/dvb/dvb-usb/a800.c
+++ b/drivers/media/dvb/dvb-usb/a800.c
@@ -149,7 +149,7 @@ static struct dvb_usb_properties a800_properties = {
 
 static struct usb_driver a800_driver = {
        .owner          = THIS_MODULE,
-       .name           = "AVerMedia AverTV DVB-T USB 2.0 (A800)",
+       .name           = "dvb_usb_a800",
        .probe          = a800_probe,
        .disconnect = dvb_usb_device_exit,
        .id_table       = a800_table,

diff --git a/drivers/media/dvb/dvb-usb/cxusb.c b/drivers/media/dvb/dvb-usb/cxusb.c
index b4bb206a510ff6b8d97259df14ddfeed114097c0..c3e1b661aae632b74c74c207e67a0f1c1483605b 100644 (file)
--- a/drivers/media/dvb/dvb-usb/cxusb.c
+++ b/drivers/media/dvb/dvb-usb/cxusb.c
@@ -262,7 +262,7 @@ static struct dvb_usb_properties cxusb_properties = {
 
 static struct usb_driver cxusb_driver = {
        .owner          = THIS_MODULE,
-       .name           = "cxusb",
+       .name           = "dvb_usb_cxusb",
        .probe          = cxusb_probe,
        .disconnect = dvb_usb_device_exit,
        .id_table       = cxusb_table,

diff --git a/drivers/media/dvb/dvb-usb/dibusb-mb.c b/drivers/media/dvb/dvb-usb/dibusb-mb.c
index cda2179d61aa1d5a82a1ca5395e380dedbc4d039..828b5182e16c31b62bbbd7f1b906225a511d2258 100644 (file)
--- a/drivers/media/dvb/dvb-usb/dibusb-mb.c
+++ b/drivers/media/dvb/dvb-usb/dibusb-mb.c
@@ -317,7 +317,7 @@ static struct dvb_usb_properties dibusb2_0b_properties = {
 
 static struct usb_driver dibusb_driver = {
        .owner          = THIS_MODULE,
-       .name           = "DiBcom based USB DVB-T devices (DiB3000M-B based)",
+       .name           = "dvb_usb_dibusb_mb",
        .probe          = dibusb_probe,
        .disconnect = dvb_usb_device_exit,
        .id_table       = dibusb_dib3000mb_table,

diff --git a/drivers/media/dvb/dvb-usb/dibusb-mc.c b/drivers/media/dvb/dvb-usb/dibusb-mc.c
index aad8ed3fe005f821c8c03b2cc9cd3f4fac99a053..e9dac430f37da036079d2ea50a77ae8113ad63eb 100644 (file)
--- a/drivers/media/dvb/dvb-usb/dibusb-mc.c
+++ b/drivers/media/dvb/dvb-usb/dibusb-mc.c
@@ -83,7 +83,7 @@ static struct dvb_usb_properties dibusb_mc_properties = {
 
 static struct usb_driver dibusb_mc_driver = {
        .owner          = THIS_MODULE,
-       .name           = "DiBcom based USB2.0 DVB-T (DiB3000M-C/P based) devices",
+       .name           = "dvb_usb_dibusb_mc",
        .probe          = dibusb_mc_probe,
        .disconnect = dvb_usb_device_exit,
        .id_table       = dibusb_dib3000mc_table,

diff --git a/drivers/media/dvb/dvb-usb/digitv.c b/drivers/media/dvb/dvb-usb/digitv.c
index 8155a26f0ddfe5924c8cca6efd976e95379558fd..9a676afc1d6e89c4943db39b1e3a93202adbf033 100644 (file)
--- a/drivers/media/dvb/dvb-usb/digitv.c
+++ b/drivers/media/dvb/dvb-usb/digitv.c
@@ -228,7 +228,7 @@ static struct dvb_usb_properties digitv_properties = {
 
 static struct usb_driver digitv_driver = {
        .owner          = THIS_MODULE,
-       .name           = "Nebula Electronics uDigiTV DVB-T USB2.0 device",
+       .name           = "dvb_usb_digitv",
        .probe          = digitv_probe,
        .disconnect = dvb_usb_device_exit,
        .id_table       = digitv_table,

diff --git a/drivers/media/dvb/dvb-usb/nova-t-usb2.c b/drivers/media/dvb/dvb-usb/nova-t-usb2.c
index 9d83781aef95a525c34d1861e617b67a90118cf3..258a92bfbcc79d354a6ffaaeb8e09be826890c2f 100644 (file)
--- a/drivers/media/dvb/dvb-usb/nova-t-usb2.c
+++ b/drivers/media/dvb/dvb-usb/nova-t-usb2.c
@@ -203,7 +203,7 @@ static struct dvb_usb_properties nova_t_properties = {
 
 static struct usb_driver nova_t_driver = {
        .owner          = THIS_MODULE,
-       .name           = "Hauppauge WinTV-NOVA-T usb2",
+       .name           = "dvb_usb_nova_t_usb2",
        .probe          = nova_t_probe,
        .disconnect = dvb_usb_device_exit,
        .id_table       = nova_t_table,

diff --git a/drivers/media/dvb/dvb-usb/umt-010.c b/drivers/media/dvb/dvb-usb/umt-010.c
index aa560422ce7c583d9f8dc620383e8f6e35ea90b1..2112ac3cf5e2c35a7059d4fa00594ff397795aba 100644 (file)
--- a/drivers/media/dvb/dvb-usb/umt-010.c
+++ b/drivers/media/dvb/dvb-usb/umt-010.c
@@ -129,7 +129,7 @@ static struct dvb_usb_properties umt_properties = {
 
 static struct usb_driver umt_driver = {
        .owner          = THIS_MODULE,
-       .name           = "HanfTek UMT-010 USB2.0 DVB-T devices",
+       .name           = "dvb_usb_umt_010",
        .probe          = umt_probe,
        .disconnect = dvb_usb_device_exit,
        .id_table       = umt_table,

diff --git a/drivers/media/dvb/dvb-usb/vp7045.c b/drivers/media/dvb/dvb-usb/vp7045.c
index 72d5d3f74463303933b696db94f70e53e4b674f7..5adc5d69ec845e8bc5abf2c37fcb2584d036da02 100644 (file)
--- a/drivers/media/dvb/dvb-usb/vp7045.c
+++ b/drivers/media/dvb/dvb-usb/vp7045.c
@@ -44,7 +44,7 @@ int vp7045_usb_op(struct dvb_usb_device *d, u8 cmd, u8 *out, int outlen, u8 *in,
        if (usb_control_msg(d->udev,
                        usb_sndctrlpipe(d->udev,0),
                        TH_COMMAND_OUT, USB_TYPE_VENDOR | USB_DIR_OUT, 0, 0,
-                       outbuf, 20, 2*HZ) != 20) {
+                       outbuf, 20, 2000) != 20) {
                err("USB control message 'out' went wrong.");
                ret = -EIO;
                goto unlock;
@@ -55,7 +55,7 @@ int vp7045_usb_op(struct dvb_usb_device *d, u8 cmd, u8 *out, int outlen, u8 *in,
        if (usb_control_msg(d->udev,
                        usb_rcvctrlpipe(d->udev,0),
                        TH_COMMAND_IN, USB_TYPE_VENDOR | USB_DIR_IN, 0, 0,
-                       inbuf, 12, 2*HZ) != 12) {
+                       inbuf, 12, 2000) != 12) {
                err("USB control message 'in' went wrong.");
                ret = -EIO;
                goto unlock;
@@ -255,7 +255,7 @@ static struct dvb_usb_properties vp7045_properties = {
 /* usb specific object needed to register this driver with the usb subsystem */
 static struct usb_driver vp7045_usb_driver = {
        .owner          = THIS_MODULE,
-       .name           = "dvb-usb-vp7045",
+       .name           = "dvb_usb_vp7045",
        .probe          = vp7045_usb_probe,
        .disconnect = dvb_usb_device_exit,
        .id_table       = vp7045_usb_table,