diff options
author | Alan Stern <stern@rowland.harvard.edu> | 2008-10-02 11:47:15 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2008-10-17 17:41:02 -0400 |
commit | 2b70f07343389cb474235def00b021a645ede916 (patch) | |
tree | dd32720ba6c114f097cd4ff07aeaad4112c19031 /drivers/usb/host | |
parent | 1987625226a918cd20c334ffce5e2a224cba0718 (diff) |
USB: EHCI, OHCI, UHCI: remove version numbers
This patch (as1145) removes the essentially useless driver-version
strings from ehci-hcd, ohci-hcd, and uhci-hcd. It also unifies the
form of the banner lines they display upon loading and adds a missing
test for usb_disabled() to ehci-hcd.
Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/usb/host')
-rw-r--r-- | drivers/usb/host/ehci-dbg.c | 4 | ||||
-rw-r--r-- | drivers/usb/host/ehci-hcd.c | 13 | ||||
-rw-r--r-- | drivers/usb/host/ohci-dbg.c | 2 | ||||
-rw-r--r-- | drivers/usb/host/ohci-hcd.c | 7 | ||||
-rw-r--r-- | drivers/usb/host/ohci-pnx4008.c | 2 | ||||
-rw-r--r-- | drivers/usb/host/uhci-hcd.c | 7 |
6 files changed, 16 insertions, 19 deletions
diff --git a/drivers/usb/host/ehci-dbg.c b/drivers/usb/host/ehci-dbg.c index 5d57773e730e..0cb53ca8d343 100644 --- a/drivers/usb/host/ehci-dbg.c +++ b/drivers/usb/host/ehci-dbg.c | |||
@@ -675,7 +675,7 @@ static ssize_t fill_registers_buffer(struct debug_buffer *buf) | |||
675 | 675 | ||
676 | if (!test_bit(HCD_FLAG_HW_ACCESSIBLE, &hcd->flags)) { | 676 | if (!test_bit(HCD_FLAG_HW_ACCESSIBLE, &hcd->flags)) { |
677 | size = scnprintf (next, size, | 677 | size = scnprintf (next, size, |
678 | "bus %s, device %s (driver " DRIVER_VERSION ")\n" | 678 | "bus %s, device %s\n" |
679 | "%s\n" | 679 | "%s\n" |
680 | "SUSPENDED (no register access)\n", | 680 | "SUSPENDED (no register access)\n", |
681 | hcd->self.controller->bus->name, | 681 | hcd->self.controller->bus->name, |
@@ -687,7 +687,7 @@ static ssize_t fill_registers_buffer(struct debug_buffer *buf) | |||
687 | /* Capability Registers */ | 687 | /* Capability Registers */ |
688 | i = HC_VERSION(ehci_readl(ehci, &ehci->caps->hc_capbase)); | 688 | i = HC_VERSION(ehci_readl(ehci, &ehci->caps->hc_capbase)); |
689 | temp = scnprintf (next, size, | 689 | temp = scnprintf (next, size, |
690 | "bus %s, device %s (driver " DRIVER_VERSION ")\n" | 690 | "bus %s, device %s\n" |
691 | "%s\n" | 691 | "%s\n" |
692 | "EHCI %x.%02x, hcd state %d\n", | 692 | "EHCI %x.%02x, hcd state %d\n", |
693 | hcd->self.controller->bus->name, | 693 | hcd->self.controller->bus->name, |
diff --git a/drivers/usb/host/ehci-hcd.c b/drivers/usb/host/ehci-hcd.c index c6f9961eed3c..fcbc1f2b2377 100644 --- a/drivers/usb/host/ehci-hcd.c +++ b/drivers/usb/host/ehci-hcd.c | |||
@@ -60,7 +60,6 @@ | |||
60 | * providing early devices for those host controllers to talk to! | 60 | * providing early devices for those host controllers to talk to! |
61 | */ | 61 | */ |
62 | 62 | ||
63 | #define DRIVER_VERSION "10 Dec 2004" | ||
64 | #define DRIVER_AUTHOR "David Brownell" | 63 | #define DRIVER_AUTHOR "David Brownell" |
65 | #define DRIVER_DESC "USB 2.0 'Enhanced' Host Controller (EHCI) Driver" | 64 | #define DRIVER_DESC "USB 2.0 'Enhanced' Host Controller (EHCI) Driver" |
66 | 65 | ||
@@ -621,9 +620,9 @@ static int ehci_run (struct usb_hcd *hcd) | |||
621 | 620 | ||
622 | temp = HC_VERSION(ehci_readl(ehci, &ehci->caps->hc_capbase)); | 621 | temp = HC_VERSION(ehci_readl(ehci, &ehci->caps->hc_capbase)); |
623 | ehci_info (ehci, | 622 | ehci_info (ehci, |
624 | "USB %x.%x started, EHCI %x.%02x, driver %s%s\n", | 623 | "USB %x.%x started, EHCI %x.%02x%s\n", |
625 | ((ehci->sbrn & 0xf0)>>4), (ehci->sbrn & 0x0f), | 624 | ((ehci->sbrn & 0xf0)>>4), (ehci->sbrn & 0x0f), |
626 | temp >> 8, temp & 0xff, DRIVER_VERSION, | 625 | temp >> 8, temp & 0xff, |
627 | ignore_oc ? ", overcurrent ignored" : ""); | 626 | ignore_oc ? ", overcurrent ignored" : ""); |
628 | 627 | ||
629 | ehci_writel(ehci, INTR_MASK, | 628 | ehci_writel(ehci, INTR_MASK, |
@@ -995,9 +994,7 @@ static int ehci_get_frame (struct usb_hcd *hcd) | |||
995 | 994 | ||
996 | /*-------------------------------------------------------------------------*/ | 995 | /*-------------------------------------------------------------------------*/ |
997 | 996 | ||
998 | #define DRIVER_INFO DRIVER_VERSION " " DRIVER_DESC | 997 | MODULE_DESCRIPTION(DRIVER_DESC); |
999 | |||
1000 | MODULE_DESCRIPTION (DRIVER_INFO); | ||
1001 | MODULE_AUTHOR (DRIVER_AUTHOR); | 998 | MODULE_AUTHOR (DRIVER_AUTHOR); |
1002 | MODULE_LICENSE ("GPL"); | 999 | MODULE_LICENSE ("GPL"); |
1003 | 1000 | ||
@@ -1045,6 +1042,10 @@ static int __init ehci_hcd_init(void) | |||
1045 | { | 1042 | { |
1046 | int retval = 0; | 1043 | int retval = 0; |
1047 | 1044 | ||
1045 | if (usb_disabled()) | ||
1046 | return -ENODEV; | ||
1047 | |||
1048 | printk(KERN_INFO "%s: " DRIVER_DESC "\n", hcd_name); | ||
1048 | pr_debug("%s: block sizes: qh %Zd qtd %Zd itd %Zd sitd %Zd\n", | 1049 | pr_debug("%s: block sizes: qh %Zd qtd %Zd itd %Zd sitd %Zd\n", |
1049 | hcd_name, | 1050 | hcd_name, |
1050 | sizeof(struct ehci_qh), sizeof(struct ehci_qtd), | 1051 | sizeof(struct ehci_qh), sizeof(struct ehci_qtd), |
diff --git a/drivers/usb/host/ohci-dbg.c b/drivers/usb/host/ohci-dbg.c index 7cef1d2f7ccc..d3269656aa4d 100644 --- a/drivers/usb/host/ohci-dbg.c +++ b/drivers/usb/host/ohci-dbg.c | |||
@@ -649,7 +649,7 @@ static ssize_t fill_registers_buffer(struct debug_buffer *buf) | |||
649 | ohci_dbg_sw (ohci, &next, &size, | 649 | ohci_dbg_sw (ohci, &next, &size, |
650 | "bus %s, device %s\n" | 650 | "bus %s, device %s\n" |
651 | "%s\n" | 651 | "%s\n" |
652 | "%s version " DRIVER_VERSION "\n", | 652 | "%s\n", |
653 | hcd->self.controller->bus->name, | 653 | hcd->self.controller->bus->name, |
654 | dev_name(hcd->self.controller), | 654 | dev_name(hcd->self.controller), |
655 | hcd->product_desc, | 655 | hcd->product_desc, |
diff --git a/drivers/usb/host/ohci-hcd.c b/drivers/usb/host/ohci-hcd.c index 89901962cbfd..0afeda836df3 100644 --- a/drivers/usb/host/ohci-hcd.c +++ b/drivers/usb/host/ohci-hcd.c | |||
@@ -46,7 +46,6 @@ | |||
46 | 46 | ||
47 | #include "../core/hcd.h" | 47 | #include "../core/hcd.h" |
48 | 48 | ||
49 | #define DRIVER_VERSION "2006 August 04" | ||
50 | #define DRIVER_AUTHOR "Roman Weissgaerber, David Brownell" | 49 | #define DRIVER_AUTHOR "Roman Weissgaerber, David Brownell" |
51 | #define DRIVER_DESC "USB 1.1 'Open' Host Controller (OHCI) Driver" | 50 | #define DRIVER_DESC "USB 1.1 'Open' Host Controller (OHCI) Driver" |
52 | 51 | ||
@@ -984,10 +983,8 @@ static int ohci_restart (struct ohci_hcd *ohci) | |||
984 | 983 | ||
985 | /*-------------------------------------------------------------------------*/ | 984 | /*-------------------------------------------------------------------------*/ |
986 | 985 | ||
987 | #define DRIVER_INFO DRIVER_VERSION " " DRIVER_DESC | ||
988 | |||
989 | MODULE_AUTHOR (DRIVER_AUTHOR); | 986 | MODULE_AUTHOR (DRIVER_AUTHOR); |
990 | MODULE_DESCRIPTION (DRIVER_INFO); | 987 | MODULE_DESCRIPTION(DRIVER_DESC); |
991 | MODULE_LICENSE ("GPL"); | 988 | MODULE_LICENSE ("GPL"); |
992 | 989 | ||
993 | #ifdef CONFIG_PCI | 990 | #ifdef CONFIG_PCI |
@@ -1095,7 +1092,7 @@ static int __init ohci_hcd_mod_init(void) | |||
1095 | if (usb_disabled()) | 1092 | if (usb_disabled()) |
1096 | return -ENODEV; | 1093 | return -ENODEV; |
1097 | 1094 | ||
1098 | printk (KERN_DEBUG "%s: " DRIVER_INFO "\n", hcd_name); | 1095 | printk(KERN_INFO "%s: " DRIVER_DESC "\n", hcd_name); |
1099 | pr_debug ("%s: block sizes: ed %Zd td %Zd\n", hcd_name, | 1096 | pr_debug ("%s: block sizes: ed %Zd td %Zd\n", hcd_name, |
1100 | sizeof (struct ed), sizeof (struct td)); | 1097 | sizeof (struct ed), sizeof (struct td)); |
1101 | 1098 | ||
diff --git a/drivers/usb/host/ohci-pnx4008.c b/drivers/usb/host/ohci-pnx4008.c index 658a2a978c32..e306ca6aef3d 100644 --- a/drivers/usb/host/ohci-pnx4008.c +++ b/drivers/usb/host/ohci-pnx4008.c | |||
@@ -331,7 +331,7 @@ static int __devinit usb_hcd_pnx4008_probe(struct platform_device *pdev) | |||
331 | 331 | ||
332 | int ret = 0, irq; | 332 | int ret = 0, irq; |
333 | 333 | ||
334 | dev_dbg(&pdev->dev, "%s: " DRIVER_INFO " (pnx4008)\n", hcd_name); | 334 | dev_dbg(&pdev->dev, "%s: " DRIVER_DESC " (pnx4008)\n", hcd_name); |
335 | if (usb_disabled()) { | 335 | if (usb_disabled()) { |
336 | err("USB is disabled"); | 336 | err("USB is disabled"); |
337 | ret = -ENODEV; | 337 | ret = -ENODEV; |
diff --git a/drivers/usb/host/uhci-hcd.c b/drivers/usb/host/uhci-hcd.c index 3a7bfe7a8874..2dddb258b0db 100644 --- a/drivers/usb/host/uhci-hcd.c +++ b/drivers/usb/host/uhci-hcd.c | |||
@@ -53,7 +53,6 @@ | |||
53 | /* | 53 | /* |
54 | * Version Information | 54 | * Version Information |
55 | */ | 55 | */ |
56 | #define DRIVER_VERSION "v3.0" | ||
57 | #define DRIVER_AUTHOR "Linus 'Frodo Rabbit' Torvalds, Johannes Erdfelt, \ | 56 | #define DRIVER_AUTHOR "Linus 'Frodo Rabbit' Torvalds, Johannes Erdfelt, \ |
58 | Randy Dunlap, Georg Acher, Deti Fliegl, Thomas Sailer, Roman Weissgaerber, \ | 57 | Randy Dunlap, Georg Acher, Deti Fliegl, Thomas Sailer, Roman Weissgaerber, \ |
59 | Alan Stern" | 58 | Alan Stern" |
@@ -951,12 +950,12 @@ static int __init uhci_hcd_init(void) | |||
951 | { | 950 | { |
952 | int retval = -ENOMEM; | 951 | int retval = -ENOMEM; |
953 | 952 | ||
954 | printk(KERN_INFO DRIVER_DESC " " DRIVER_VERSION "%s\n", | ||
955 | ignore_oc ? ", overcurrent ignored" : ""); | ||
956 | |||
957 | if (usb_disabled()) | 953 | if (usb_disabled()) |
958 | return -ENODEV; | 954 | return -ENODEV; |
959 | 955 | ||
956 | printk(KERN_INFO "uhci_hcd: " DRIVER_DESC "%s\n", | ||
957 | ignore_oc ? ", overcurrent ignored" : ""); | ||
958 | |||
960 | if (DEBUG_CONFIGURED) { | 959 | if (DEBUG_CONFIGURED) { |
961 | errbuf = kmalloc(ERRBUF_LEN, GFP_KERNEL); | 960 | errbuf = kmalloc(ERRBUF_LEN, GFP_KERNEL); |
962 | if (!errbuf) | 961 | if (!errbuf) |