Module Name: src
Committed By: riastradh
Date: Thu Mar 3 05:56:00 UTC 2022
Modified Files:
src/sys/dev/usb: if_cdce.c if_udav.c if_upl.c if_urndis.c
Log Message:
usbnet drivers: Simplify return of usbnet_init_rx_tx.
To generate a diff of this commit:
cvs rdiff -u -r1.77 -r1.78 src/sys/dev/usb/if_cdce.c
cvs rdiff -u -r1.94 -r1.95 src/sys/dev/usb/if_udav.c
cvs rdiff -u -r1.73 -r1.74 src/sys/dev/usb/if_upl.c
cvs rdiff -u -r1.43 -r1.44 src/sys/dev/usb/if_urndis.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/dev/usb/if_cdce.c
diff -u src/sys/dev/usb/if_cdce.c:1.77 src/sys/dev/usb/if_cdce.c:1.78
--- src/sys/dev/usb/if_cdce.c:1.77 Thu Mar 3 05:55:52 2022
+++ src/sys/dev/usb/if_cdce.c Thu Mar 3 05:56:00 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: if_cdce.c,v 1.77 2022/03/03 05:55:52 riastradh Exp $ */
+/* $NetBSD: if_cdce.c,v 1.78 2022/03/03 05:56:00 riastradh Exp $ */
/*
* Copyright (c) 1997, 1998, 1999, 2000-2003 Bill Paul <wp...@windriver.com>
@@ -40,7 +40,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_cdce.c,v 1.77 2022/03/03 05:55:52 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_cdce.c,v 1.78 2022/03/03 05:56:00 riastradh Exp $");
#include <sys/param.h>
@@ -259,11 +259,8 @@ static int
cdce_uno_init(struct ifnet *ifp)
{
struct usbnet *un = ifp->if_softc;
- int rv;
- rv = usbnet_init_rx_tx(un);
-
- return rv;
+ return usbnet_init_rx_tx(un);
}
static void
Index: src/sys/dev/usb/if_udav.c
diff -u src/sys/dev/usb/if_udav.c:1.94 src/sys/dev/usb/if_udav.c:1.95
--- src/sys/dev/usb/if_udav.c:1.94 Thu Mar 3 05:55:19 2022
+++ src/sys/dev/usb/if_udav.c Thu Mar 3 05:56:00 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: if_udav.c,v 1.94 2022/03/03 05:55:19 riastradh Exp $ */
+/* $NetBSD: if_udav.c,v 1.95 2022/03/03 05:56:00 riastradh Exp $ */
/* $nabe: if_udav.c,v 1.3 2003/08/21 16:57:19 nabe Exp $ */
/*
@@ -45,7 +45,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_udav.c,v 1.94 2022/03/03 05:55:19 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_udav.c,v 1.95 2022/03/03 05:56:00 riastradh Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -502,11 +502,9 @@ udav_uno_init(struct ifnet *ifp)
}
if (usbnet_isdying(un))
- rc = EIO;
- else
- rc = usbnet_init_rx_tx(un);
+ return EIO;
- return rc;
+ return usbnet_init_rx_tx(un);
}
static void
Index: src/sys/dev/usb/if_upl.c
diff -u src/sys/dev/usb/if_upl.c:1.73 src/sys/dev/usb/if_upl.c:1.74
--- src/sys/dev/usb/if_upl.c:1.73 Thu Mar 3 05:55:01 2022
+++ src/sys/dev/usb/if_upl.c Thu Mar 3 05:56:00 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: if_upl.c,v 1.73 2022/03/03 05:55:01 riastradh Exp $ */
+/* $NetBSD: if_upl.c,v 1.74 2022/03/03 05:56:00 riastradh Exp $ */
/*
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_upl.c,v 1.73 2022/03/03 05:55:01 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_upl.c,v 1.74 2022/03/03 05:56:00 riastradh Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -255,11 +255,8 @@ static int
upl_uno_init(struct ifnet *ifp)
{
struct usbnet * const un = ifp->if_softc;
- int rv;
- rv = usbnet_init_rx_tx(un);
-
- return rv;
+ return usbnet_init_rx_tx(un);
}
static int
Index: src/sys/dev/usb/if_urndis.c
diff -u src/sys/dev/usb/if_urndis.c:1.43 src/sys/dev/usb/if_urndis.c:1.44
--- src/sys/dev/usb/if_urndis.c:1.43 Thu Mar 3 05:55:52 2022
+++ src/sys/dev/usb/if_urndis.c Thu Mar 3 05:56:00 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: if_urndis.c,v 1.43 2022/03/03 05:55:52 riastradh Exp $ */
+/* $NetBSD: if_urndis.c,v 1.44 2022/03/03 05:56:00 riastradh Exp $ */
/* $OpenBSD: if_urndis.c,v 1.31 2011/07/03 15:47:17 matthew Exp $ */
/*
@@ -21,7 +21,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_urndis.c,v 1.43 2022/03/03 05:55:52 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_urndis.c,v 1.44 2022/03/03 05:56:00 riastradh Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -877,9 +877,8 @@ urndis_uno_init(struct ifnet *ifp)
error = urndis_init_un(ifp, un);
if (error)
return EIO; /* XXX */
- error = usbnet_init_rx_tx(un);
- return error;
+ return usbnet_init_rx_tx(un);
}
static int
