Thu Mar 3 05:55:01 2022 UTC ()
usbnet drivers: Omit needless isdying tests in *_uno_init.
usbnet(9) already checks this immediately before calling *_uno_init.
(riastradh)
diff -r1.186 -r1.187 src/sys/dev/usb/if_aue.c
diff -r1.145 -r1.146 src/sys/dev/usb/if_axe.c
diff -r1.89 -r1.90 src/sys/dev/usb/if_axen.c
diff -r1.74 -r1.75 src/sys/dev/usb/if_cdce.c
diff -r1.102 -r1.103 src/sys/dev/usb/if_cue.c
diff -r1.114 -r1.115 src/sys/dev/usb/if_kue.c
diff -r1.17 -r1.18 src/sys/dev/usb/if_mos.c
diff -r1.77 -r1.78 src/sys/dev/usb/if_mue.c
diff -r1.87 -r1.88 src/sys/dev/usb/if_smsc.c
diff -r1.92 -r1.93 src/sys/dev/usb/if_udav.c
diff -r1.72 -r1.73 src/sys/dev/usb/if_upl.c
diff -r1.52 -r1.53 src/sys/dev/usb/if_ure.c
diff -r1.91 -r1.92 src/sys/dev/usb/if_url.c
--- src/sys/dev/usb/if_aue.c 2022/03/03 05:54:37 1.186
+++ src/sys/dev/usb/if_aue.c 2022/03/03 05:55:01 1.187
@@ -1,4 +1,4 @@
-/* $NetBSD: if_aue.c,v 1.186 2022/03/03 05:54:37 riastradh Exp $ */
+/* $NetBSD: if_aue.c,v 1.187 2022/03/03 05:55:01 riastradh Exp $ */
/*
* Copyright (c) 1997, 1998, 1999, 2000
@@ -76,7 +76,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_aue.c,v 1.186 2022/03/03 05:54:37 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_aue.c,v 1.187 2022/03/03 05:55:01 riastradh Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -953,9 +953,6 @@
AUEHIST_FUNC();
AUEHIST_CALLARGSN(5, "aue%jd: enter link=%jd",
device_unit(un->un_dev), usbnet_havelink(un), 0, 0);
-
- if (usbnet_isdying(un))
- return EIO;
/* Cancel pending I/O */
if (ifp->if_flags & IFF_RUNNING)
--- src/sys/dev/usb/if_axe.c 2022/03/03 05:54:37 1.145
+++ src/sys/dev/usb/if_axe.c 2022/03/03 05:55:01 1.146
@@ -1,4 +1,4 @@
-/* $NetBSD: if_axe.c,v 1.145 2022/03/03 05:54:37 riastradh Exp $ */
+/* $NetBSD: if_axe.c,v 1.146 2022/03/03 05:55:01 riastradh Exp $ */
/* $OpenBSD: if_axe.c,v 1.137 2016/04/13 11:03:37 mpi Exp $ */
/*
@@ -87,7 +87,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_axe.c,v 1.145 2022/03/03 05:54:37 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_axe.c,v 1.146 2022/03/03 05:55:01 riastradh Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -1210,9 +1210,6 @@
struct usbnet * const un = ifp->if_softc;
struct axe_softc * const sc = usbnet_softc(un);
int rxmode;
-
- if (usbnet_isdying(un))
- return EIO;
/* Cancel pending I/O */
usbnet_stop(un, ifp, 1);
--- src/sys/dev/usb/if_axen.c 2022/03/03 05:54:37 1.89
+++ src/sys/dev/usb/if_axen.c 2022/03/03 05:55:01 1.90
@@ -1,4 +1,4 @@
-/* $NetBSD: if_axen.c,v 1.89 2022/03/03 05:54:37 riastradh Exp $ */
+/* $NetBSD: if_axen.c,v 1.90 2022/03/03 05:55:01 riastradh Exp $ */
/* $OpenBSD: if_axen.c,v 1.3 2013/10/21 10:10:22 yuo Exp $ */
/*
@@ -23,7 +23,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_axen.c,v 1.89 2022/03/03 05:54:37 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_axen.c,v 1.90 2022/03/03 05:55:01 riastradh Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -875,9 +875,6 @@
uint16_t rxmode;
uint16_t wval;
uint8_t bval;
-
- if (usbnet_isdying(un))
- return EIO;
/* Cancel pending I/O */
usbnet_stop(un, ifp, 1);
--- src/sys/dev/usb/if_cdce.c 2022/03/03 05:52:20 1.74
+++ src/sys/dev/usb/if_cdce.c 2022/03/03 05:55:01 1.75
@@ -1,4 +1,4 @@
-/* $NetBSD: if_cdce.c,v 1.74 2022/03/03 05:52:20 riastradh Exp $ */
+/* $NetBSD: if_cdce.c,v 1.75 2022/03/03 05:55:01 riastradh Exp $ */
/*
* Copyright (c) 1997, 1998, 1999, 2000-2003 Bill Paul <wpaul@windriver.com>
@@ -40,7 +40,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_cdce.c,v 1.74 2022/03/03 05:52:20 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_cdce.c,v 1.75 2022/03/03 05:55:01 riastradh Exp $");
#include <sys/param.h>
@@ -261,13 +261,9 @@
struct usbnet *un = ifp->if_softc;
int rv;
- if (usbnet_isdying(un))
- rv = EIO;
- else {
- usbnet_stop(un, ifp, 1);
- rv = usbnet_init_rx_tx(un);
- usbnet_set_link(un, rv == 0);
- }
+ usbnet_stop(un, ifp, 1);
+ rv = usbnet_init_rx_tx(un);
+ usbnet_set_link(un, rv == 0);
return rv;
}
--- src/sys/dev/usb/if_cue.c 2022/03/03 05:54:37 1.102
+++ src/sys/dev/usb/if_cue.c 2022/03/03 05:55:01 1.103
@@ -1,4 +1,4 @@
-/* $NetBSD: if_cue.c,v 1.102 2022/03/03 05:54:37 riastradh Exp $ */
+/* $NetBSD: if_cue.c,v 1.103 2022/03/03 05:55:01 riastradh Exp $ */
/*
* Copyright (c) 1997, 1998, 1999, 2000
@@ -57,7 +57,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_cue.c,v 1.102 2022/03/03 05:54:37 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_cue.c,v 1.103 2022/03/03 05:55:01 riastradh Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -616,9 +616,6 @@
const u_char *eaddr;
DPRINTFN(10,("%s: %s: enter\n", device_xname(un->un_dev),__func__));
-
- if (usbnet_isdying(un))
- return ENXIO;
/* Cancel pending I/O */
usbnet_stop(un, ifp, 1);
--- src/sys/dev/usb/if_kue.c 2022/03/03 05:53:33 1.114
+++ src/sys/dev/usb/if_kue.c 2022/03/03 05:55:01 1.115
@@ -1,4 +1,4 @@
-/* $NetBSD: if_kue.c,v 1.114 2022/03/03 05:53:33 riastradh Exp $ */
+/* $NetBSD: if_kue.c,v 1.115 2022/03/03 05:55:01 riastradh Exp $ */
/*
* Copyright (c) 1997, 1998, 1999, 2000
@@ -71,7 +71,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_kue.c,v 1.114 2022/03/03 05:53:33 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_kue.c,v 1.115 2022/03/03 05:55:01 riastradh Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -598,9 +598,6 @@
uint8_t eaddr[ETHER_ADDR_LEN];
DPRINTFN(5,("%s: %s: enter\n", device_xname(un->un_dev),__func__));
-
- if (usbnet_isdying(un))
- return EIO;
/* Cancel pending I/O */
usbnet_stop(un, ifp, 1);
--- src/sys/dev/usb/if_mos.c 2022/03/03 05:54:21 1.17
+++ src/sys/dev/usb/if_mos.c 2022/03/03 05:55:01 1.18
@@ -1,4 +1,4 @@
-/* $NetBSD: if_mos.c,v 1.17 2022/03/03 05:54:21 riastradh Exp $ */
+/* $NetBSD: if_mos.c,v 1.18 2022/03/03 05:55:01 riastradh Exp $ */
/* $OpenBSD: if_mos.c,v 1.40 2019/07/07 06:40:10 kevlo Exp $ */
/*
@@ -72,7 +72,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_mos.c,v 1.17 2022/03/03 05:54:21 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_mos.c,v 1.18 2022/03/03 05:55:01 riastradh Exp $");
#include <sys/param.h>
@@ -731,9 +731,6 @@
struct usbnet * const un = ifp->if_softc;
u_int8_t rxmode;
unsigned char ipgs[2];
-
- if (usbnet_isdying(un))
- return EIO;
/* Cancel pending I/O */
usbnet_stop(un, ifp, 1);
--- src/sys/dev/usb/if_mue.c 2022/03/03 05:54:37 1.77
+++ src/sys/dev/usb/if_mue.c 2022/03/03 05:55:01 1.78
@@ -1,4 +1,4 @@
-/* $NetBSD: if_mue.c,v 1.77 2022/03/03 05:54:37 riastradh Exp $ */
+/* $NetBSD: if_mue.c,v 1.78 2022/03/03 05:55:01 riastradh Exp $ */
/* $OpenBSD: if_mue.c,v 1.3 2018/08/04 16:42:46 jsg Exp $ */
/*
@@ -20,7 +20,7 @@
/* Driver for Microchip LAN7500/LAN7800 chipsets. */
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_mue.c,v 1.77 2022/03/03 05:54:37 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_mue.c,v 1.78 2022/03/03 05:55:01 riastradh Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -1232,11 +1232,6 @@
mue_uno_init(struct ifnet *ifp)
{
struct usbnet * const un = ifp->if_softc;
-
- if (usbnet_isdying(un)) {
- DPRINTF(un, "dying\n");
- return EIO;
- }
/* Cancel pending I/O and free all TX/RX buffers. */
if (ifp->if_flags & IFF_RUNNING)
--- src/sys/dev/usb/if_smsc.c 2022/03/03 05:54:37 1.87
+++ src/sys/dev/usb/if_smsc.c 2022/03/03 05:55:01 1.88
@@ -1,4 +1,4 @@
-/* $NetBSD: if_smsc.c,v 1.87 2022/03/03 05:54:37 riastradh Exp $ */
+/* $NetBSD: if_smsc.c,v 1.88 2022/03/03 05:55:01 riastradh Exp $ */
/* $OpenBSD: if_smsc.c,v 1.4 2012/09/27 12:38:11 jsg Exp $ */
/* $FreeBSD: src/sys/dev/usb/net/if_smsc.c,v 1.1 2012/08/15 04:03:55 gonzo Exp $ */
@@ -61,7 +61,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_smsc.c,v 1.87 2022/03/03 05:54:37 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_smsc.c,v 1.88 2022/03/03 05:55:01 riastradh Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -554,9 +554,6 @@
{
struct usbnet * const un = ifp->if_softc;
struct smsc_softc * const sc = usbnet_softc(un);
-
- if (usbnet_isdying(un))
- return EIO;
/* Cancel pending I/O */
usbnet_stop(un, ifp, 1);
--- src/sys/dev/usb/if_udav.c 2022/03/03 05:54:37 1.92
+++ src/sys/dev/usb/if_udav.c 2022/03/03 05:55:01 1.93
@@ -1,4 +1,4 @@
-/* $NetBSD: if_udav.c,v 1.92 2022/03/03 05:54:37 riastradh Exp $ */
+/* $NetBSD: if_udav.c,v 1.93 2022/03/03 05:55:01 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.92 2022/03/03 05:54:37 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_udav.c,v 1.93 2022/03/03 05:55:01 riastradh Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -470,10 +470,6 @@
int rc = 0;
DPRINTF(("%s: %s: enter\n", device_xname(un->un_dev), __func__));
-
- if (usbnet_isdying(un)) {
- return EIO;
- }
/* Cancel pending I/O and free all TX/RX buffers */
if (ifp->if_flags & IFF_RUNNING)
--- src/sys/dev/usb/if_upl.c 2022/03/03 05:50:22 1.72
+++ src/sys/dev/usb/if_upl.c 2022/03/03 05:55:01 1.73
@@ -1,4 +1,4 @@
-/* $NetBSD: if_upl.c,v 1.72 2022/03/03 05:50:22 riastradh Exp $ */
+/* $NetBSD: if_upl.c,v 1.73 2022/03/03 05:55:01 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.72 2022/03/03 05:50:22 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_upl.c,v 1.73 2022/03/03 05:55:01 riastradh Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -257,10 +257,7 @@
struct usbnet * const un = ifp->if_softc;
int rv;
- if (usbnet_isdying(un))
- rv = EIO;
- else
- rv = usbnet_init_rx_tx(un);
+ rv = usbnet_init_rx_tx(un);
return rv;
}
--- src/sys/dev/usb/if_ure.c 2022/03/03 05:54:37 1.52
+++ src/sys/dev/usb/if_ure.c 2022/03/03 05:55:01 1.53
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ure.c,v 1.52 2022/03/03 05:54:37 riastradh Exp $ */
+/* $NetBSD: if_ure.c,v 1.53 2022/03/03 05:55:01 riastradh Exp $ */
/* $OpenBSD: if_ure.c,v 1.10 2018/11/02 21:32:30 jcs Exp $ */
/*-
@@ -30,7 +30,7 @@
/* RealTek RTL8152/RTL8153 10/100/Gigabit USB Ethernet device */
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ure.c,v 1.52 2022/03/03 05:54:37 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ure.c,v 1.53 2022/03/03 05:55:01 riastradh Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -412,9 +412,6 @@
{
struct usbnet * const un = ifp->if_softc;
uint8_t eaddr[8];
-
- if (usbnet_isdying(un))
- return EIO;
/* Cancel pending I/O. */
if (ifp->if_flags & IFF_RUNNING)
--- src/sys/dev/usb/if_url.c 2022/03/03 05:54:37 1.91
+++ src/sys/dev/usb/if_url.c 2022/03/03 05:55:01 1.92
@@ -1,4 +1,4 @@
-/* $NetBSD: if_url.c,v 1.91 2022/03/03 05:54:37 riastradh Exp $ */
+/* $NetBSD: if_url.c,v 1.92 2022/03/03 05:55:01 riastradh Exp $ */
/*
* Copyright (c) 2001, 2002
@@ -44,7 +44,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_url.c,v 1.91 2022/03/03 05:54:37 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_url.c,v 1.92 2022/03/03 05:55:01 riastradh Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -369,9 +369,6 @@
int i;
DPRINTF(("%s: %s: enter\n", device_xname(un->un_dev), __func__));
-
- if (usbnet_isdying(un))
- return EIO;
/* Cancel pending I/O and free all TX/RX buffers */
usbnet_stop(un, ifp, 1);