[src/nick-nhusb]: src/sys/arch Don't check ehci_init against USBD_NORMAL_COMP...

[skrll <skrll%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/668b7876f012
branches:  nick-nhusb
changeset: 334393:668b7876f012
user:      skrll <skrll%NetBSD.org@localhost>
date:      Fri Feb 12 16:27:42 2016 +0000

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

diffstat:

 sys/arch/arm/allwinner/awin_usb.c   |  4 ++--
 sys/arch/arm/broadcom/bcm53xx_usb.c |  4 ++--
 sys/arch/i386/pci/gcscehci.c        |  6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diffs (69 lines):

diff -r d68de5a0aec1 -r 668b7876f012 sys/arch/arm/allwinner/awin_usb.c
--- a/sys/arch/arm/allwinner/awin_usb.c Mon Feb 08 11:16:02 2016 +0000
+++ b/sys/arch/arm/allwinner/awin_usb.c Fri Feb 12 16:27:42 2016 +0000
@@ -34,7 +34,7 @@
 
 #include <sys/cdefs.h>
 
-__KERNEL_RCSID(1, "$NetBSD: awin_usb.c,v 1.17.2.4 2015/04/06 15:17:51 skrll Exp $");
+__KERNEL_RCSID(1, "$NetBSD: awin_usb.c,v 1.17.2.5 2016/02/12 16:27:42 skrll Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
@@ -235,7 +235,7 @@
        aprint_normal(": EHCI 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;
        }
diff -r d68de5a0aec1 -r 668b7876f012 sys/arch/arm/broadcom/bcm53xx_usb.c
--- a/sys/arch/arm/broadcom/bcm53xx_usb.c       Mon Feb 08 11:16:02 2016 +0000
+++ b/sys/arch/arm/broadcom/bcm53xx_usb.c       Fri Feb 12 16:27:42 2016 +0000
@@ -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 @@
        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;
        }
diff -r d68de5a0aec1 -r 668b7876f012 sys/arch/i386/pci/gcscehci.c
--- a/sys/arch/i386/pci/gcscehci.c      Mon Feb 08 11:16:02 2016 +0000
+++ b/sys/arch/i386/pci/gcscehci.c      Fri Feb 12 16:27:42 2016 +0000
@@ -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 @@
        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;
        }