CVS commit: [nick-nhusb] src/sys/arch

[Nick Hudson]

Module Name:    src
Committed By:   skrll
Date:           Fri Feb 12 16:36:33 UTC 2016

Modified Files:
        src/sys/arch/arm/broadcom [nick-nhusb]: bcm53xx_usb.c
        src/sys/arch/i386/pci [nick-nhusb]: gcscehci.c

Log Message:
Don't check ehci_init against USBD_NORMAL_COMPLETION as it returns int
and not usb_status_t


To generate a diff of this commit:
cvs rdiff -u -r1.6.4.2 -r1.6.4.3 src/sys/arch/arm/broadcom/bcm53xx_usb.c
cvs rdiff -u -r1.11.2.3 -r1.11.2.4 src/sys/arch/i386/pci/gcscehci.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: src/sys/arch/arm/broadcom/bcm53xx_usb.c
diff -u src/sys/arch/arm/broadcom/bcm53xx_usb.c:1.6.4.2 src/sys/arch/arm/broadcom/bcm53xx_usb.c:1.6.4.3
--- src/sys/arch/arm/broadcom/bcm53xx_usb.c:1.6.4.2	Fri Dec  5 13:23:37 2014
+++ src/sys/arch/arm/broadcom/bcm53xx_usb.c	Fri Feb 12 16:36:32 2016
@@ -32,7 +32,7 @@
 
 #include <sys/cdefs.h>
 
-__KERNEL_RCSID(1, "$NetBSD: bcm53xx_usb.c,v 1.6.4.2 2014/12/05 13:23:37 skrll Exp $");
+__KERNEL_RCSID(1, "$NetBSD: bcm53xx_usb.c,v 1.6.4.3 2016/02/12 16:36:32 skrll Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
@@ -183,7 +183,7 @@ ehci_bcmusb_attach(device_t parent, devi
 	aprint_normal(": ECHI USB controller\n");
 
 	int error = ehci_init(sc);
-	if (error != USBD_NORMAL_COMPLETION) {
+	if (error) {
 		aprint_error_dev(self, "init failed, error=%d\n", error);
 		return;
 	}

Index: src/sys/arch/i386/pci/gcscehci.c
diff -u src/sys/arch/i386/pci/gcscehci.c:1.11.2.3 src/sys/arch/i386/pci/gcscehci.c:1.11.2.4
--- src/sys/arch/i386/pci/gcscehci.c:1.11.2.3	Fri Dec  5 13:23:37 2014
+++ src/sys/arch/i386/pci/gcscehci.c	Fri Feb 12 16:36:33 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: gcscehci.c,v 1.11.2.3 2014/12/05 13:23:37 skrll Exp $ */
+/* $NetBSD: gcscehci.c,v 1.11.2.4 2016/02/12 16:36:33 skrll Exp $ */
 
 /*
  * Copyright (c) 2001, 2002, 2007 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gcscehci.c,v 1.11.2.3 2014/12/05 13:23:37 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gcscehci.c,v 1.11.2.4 2016/02/12 16:36:33 skrll Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -170,7 +170,7 @@ gcscehci_attach(device_t parent, device_
 	sc->sc.sc_ncomp = ncomp;
 
 	int err = ehci_init(&sc->sc);
-	if (err != USBD_NORMAL_COMPLETION) {
+	if (err) {
 		aprint_error("%s: init failed, error=%d\n", devname, err);
 		return;
 	}