This patch is part of a series that extend the UHCI HCD to support
non-PCI host controllers.
This patch fixes the following warnings from checkpatch:
ERROR: switch and case should be at the same indent
+ switch (to_pci_dev(uhci_dev(uhci))->vendor) {
+ default:
[...]
+ case PCI_VENDOR_ID_GENESYS:
[...]
+ case PCI_VENDOR_ID_INTEL:
WARNING: static char array declaration should probably be static const char
+ static char bad_Asus_board[] = "A7V8X";
WARNING: braces {} are not necessary for single statement blocks
+ else {
+ check_and_reset_hc(uhci);
+ }
Signed-off-by: Jan Andersson <jan@xxxxxxxxxxx>
---
drivers/usb/host/uhci-pci.c | 11 +++++------
1 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/drivers/usb/host/uhci-pci.c b/drivers/usb/host/uhci-pci.c
index 1a4917b..266b836 100644
--- a/drivers/usb/host/uhci-pci.c
+++ b/drivers/usb/host/uhci-pci.c
@@ -61,16 +61,16 @@ static int uhci_pci_resume_detect_interrupts_are_broken(struct uhci_hcd *uhci)
int port;
switch (to_pci_dev(uhci_dev(uhci))->vendor) {
- default:
+ default:
break;
- case PCI_VENDOR_ID_GENESYS:
+ case PCI_VENDOR_ID_GENESYS:
/* Genesys Logic's GL880S controllers don't generate
* resume-detect interrupts.
*/
return 1;
- case PCI_VENDOR_ID_INTEL:
+ case PCI_VENDOR_ID_INTEL:
/* Some of Intel's USB controllers have a bug that causes
* resume-detect interrupts if any port has an over-current
* condition. To make matters worse, some motherboards
@@ -92,7 +92,7 @@ static int uhci_pci_global_suspend_mode_is_broken(struct uhci_hcd *uhci)
{
int port;
const char *sys_info;
- static char bad_Asus_board[] = "A7V8X";
+ static const char bad_Asus_board[] = "A7V8X";
/* One of Asus's motherboards has a bug which causes it to
* wake up immediately from suspend-to-RAM if any of the ports
@@ -250,9 +250,8 @@ static int uhci_pci_resume(struct usb_hcd *hcd, bool hibernated)
/* The firmware may have changed the controller settings during
* a system wakeup. Check it and reconfigure to avoid problems.
*/
- else {
+ else
check_and_reset_hc(uhci);
- }
configure_hc(uhci);
/* Tell the core if the controller had to be reset */
--
1.7.0.4
--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
