Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/dev/usb usbnet drivers: Omit needless isdying tests in *...
details: https://anonhg.NetBSD.org/src/rev/8448a04aa895
branches: trunk
changeset: 362543:8448a04aa895
user: riastradh <riastradh%NetBSD.org@localhost>
date: Thu Mar 03 05:55:01 2022 +0000
description:
usbnet drivers: Omit needless isdying tests in *_uno_init.
usbnet(9) already checks this immediately before calling *_uno_init.
diffstat:
sys/dev/usb/if_aue.c | 7 ++-----
sys/dev/usb/if_axe.c | 7 ++-----
sys/dev/usb/if_axen.c | 7 ++-----
sys/dev/usb/if_cdce.c | 14 +++++---------
sys/dev/usb/if_cue.c | 7 ++-----
sys/dev/usb/if_kue.c | 7 ++-----
sys/dev/usb/if_mos.c | 7 ++-----
sys/dev/usb/if_mue.c | 9 ++-------
sys/dev/usb/if_smsc.c | 7 ++-----
sys/dev/usb/if_udav.c | 8 ++------
sys/dev/usb/if_upl.c | 9 +++------
sys/dev/usb/if_ure.c | 7 ++-----
sys/dev/usb/if_url.c | 7 ++-----
13 files changed, 30 insertions(+), 73 deletions(-)
diffs (truncated from 376 to 300 lines):
diff -r 8dbed936ca6a -r 8448a04aa895 sys/dev/usb/if_aue.c
--- a/sys/dev/usb/if_aue.c Thu Mar 03 05:54:52 2022 +0000
+++ b/sys/dev/usb/if_aue.c Thu Mar 03 05:55:01 2022 +0000
@@ -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"
@@ -954,9 +954,6 @@
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)
return 0;
diff -r 8dbed936ca6a -r 8448a04aa895 sys/dev/usb/if_axe.c
--- a/sys/dev/usb/if_axe.c Thu Mar 03 05:54:52 2022 +0000
+++ b/sys/dev/usb/if_axe.c Thu Mar 03 05:55:01 2022 +0000
@@ -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"
@@ -1211,9 +1211,6 @@
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);
diff -r 8dbed936ca6a -r 8448a04aa895 sys/dev/usb/if_axen.c
--- a/sys/dev/usb/if_axen.c Thu Mar 03 05:54:52 2022 +0000
+++ b/sys/dev/usb/if_axen.c Thu Mar 03 05:55:01 2022 +0000
@@ -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"
@@ -876,9 +876,6 @@
uint16_t wval;
uint8_t bval;
- if (usbnet_isdying(un))
- return EIO;
-
/* Cancel pending I/O */
usbnet_stop(un, ifp, 1);
diff -r 8dbed936ca6a -r 8448a04aa895 sys/dev/usb/if_cdce.c
--- a/sys/dev/usb/if_cdce.c Thu Mar 03 05:54:52 2022 +0000
+++ b/sys/dev/usb/if_cdce.c Thu Mar 03 05:55:01 2022 +0000
@@ -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@localhost>
@@ -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;
}
diff -r 8dbed936ca6a -r 8448a04aa895 sys/dev/usb/if_cue.c
--- a/sys/dev/usb/if_cue.c Thu Mar 03 05:54:52 2022 +0000
+++ b/sys/dev/usb/if_cue.c Thu Mar 03 05:55:01 2022 +0000
@@ -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"
@@ -617,9 +617,6 @@
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);
diff -r 8dbed936ca6a -r 8448a04aa895 sys/dev/usb/if_kue.c
--- a/sys/dev/usb/if_kue.c Thu Mar 03 05:54:52 2022 +0000
+++ b/sys/dev/usb/if_kue.c Thu Mar 03 05:55:01 2022 +0000
@@ -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"
@@ -599,9 +599,6 @@
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);
diff -r 8dbed936ca6a -r 8448a04aa895 sys/dev/usb/if_mos.c
--- a/sys/dev/usb/if_mos.c Thu Mar 03 05:54:52 2022 +0000
+++ b/sys/dev/usb/if_mos.c Thu Mar 03 05:55:01 2022 +0000
@@ -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>
@@ -732,9 +732,6 @@
u_int8_t rxmode;
unsigned char ipgs[2];
- if (usbnet_isdying(un))
- return EIO;
-
/* Cancel pending I/O */
usbnet_stop(un, ifp, 1);
diff -r 8dbed936ca6a -r 8448a04aa895 sys/dev/usb/if_mue.c
--- a/sys/dev/usb/if_mue.c Thu Mar 03 05:54:52 2022 +0000
+++ b/sys/dev/usb/if_mue.c Thu Mar 03 05:55:01 2022 +0000
@@ -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"
@@ -1233,11 +1233,6 @@
{
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)
usbnet_stop(un, ifp, 1);
diff -r 8dbed936ca6a -r 8448a04aa895 sys/dev/usb/if_smsc.c
--- a/sys/dev/usb/if_smsc.c Thu Mar 03 05:54:52 2022 +0000
+++ b/sys/dev/usb/if_smsc.c Thu Mar 03 05:55:01 2022 +0000
@@ -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"
@@ -555,9 +555,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);
diff -r 8dbed936ca6a -r 8448a04aa895 sys/dev/usb/if_udav.c
--- a/sys/dev/usb/if_udav.c Thu Mar 03 05:54:52 2022 +0000
+++ b/sys/dev/usb/if_udav.c Thu Mar 03 05:55:01 2022 +0000
@@ -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"
@@ -471,10 +471,6 @@
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)
usbnet_stop(un, ifp, 1);
diff -r 8dbed936ca6a -r 8448a04aa895 sys/dev/usb/if_upl.c
--- a/sys/dev/usb/if_upl.c Thu Mar 03 05:54:52 2022 +0000
+++ b/sys/dev/usb/if_upl.c Thu Mar 03 05:55:01 2022 +0000
@@ -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 @@
Home |
Main Index |
Thread Index |
Old Index