Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/dev/pci Pass an error code to the upper layer instead of...
details: https://anonhg.NetBSD.org/src/rev/05f545c9675f
branches: trunk
changeset: 368850:05f545c9675f
user: msaitoh <msaitoh%NetBSD.org@localhost>
date: Mon Aug 08 07:44:40 2022 +0000
description:
Pass an error code to the upper layer instead of -1. Advised by knakahara.
diffstat:
sys/dev/pci/if_wm.c | 145 ++++++++++++++++++++++++++++++---------------------
1 files changed, 84 insertions(+), 61 deletions(-)
diffs (truncated from 414 to 300 lines):
diff -r 11e7ebbc0a9b -r 05f545c9675f sys/dev/pci/if_wm.c
--- a/sys/dev/pci/if_wm.c Mon Aug 08 05:45:29 2022 +0000
+++ b/sys/dev/pci/if_wm.c Mon Aug 08 07:44:40 2022 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: if_wm.c,v 1.753 2022/08/08 05:45:29 msaitoh Exp $ */
+/* $NetBSD: if_wm.c,v 1.754 2022/08/08 07:44:40 msaitoh Exp $ */
/*
* Copyright (c) 2001, 2002, 2003, 2004 Wasabi Systems, Inc.
@@ -82,7 +82,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.753 2022/08/08 05:45:29 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.754 2022/08/08 07:44:40 msaitoh Exp $");
#ifdef _KERNEL_OPT
#include "opt_net_mpsafe.h"
@@ -4745,7 +4745,7 @@
rv = wm_gmii_hv_readreg_locked(sc->sc_dev, 2, HV_SMB_ADDR, &phy_data);
if (rv != 0)
- return -1;
+ return rv;
phy_data &= ~HV_SMB_ADDR_ADDR;
phy_data |= __SHIFTOUT(strap, STRAP_SMBUSADDR);
@@ -11627,9 +11627,10 @@
struct wm_softc *sc = device_private(dev);
int rv;
- if (sc->phy.acquire(sc)) {
+ rv = sc->phy.acquire(sc);
+ if (rv != 0) {
device_printf(dev, "%s: failed to get semaphore\n", __func__);
- return -1;
+ return rv;
}
rv = wm_gmii_i82544_readreg_locked(dev, phy, reg, val);
@@ -11678,9 +11679,10 @@
struct wm_softc *sc = device_private(dev);
int rv;
- if (sc->phy.acquire(sc)) {
+ rv = sc->phy.acquire(sc);
+ if (rv != 0) {
device_printf(dev, "%s: failed to get semaphore\n", __func__);
- return -1;
+ return rv;
}
rv = wm_gmii_i82544_writereg_locked(dev, phy, reg & MII_ADDRMASK, val);
@@ -11730,14 +11732,15 @@
struct wm_softc *sc = device_private(dev);
int page_select;
uint16_t temp, temp2;
- int rv = 0;
+ int rv;
if (phy != 1) /* Only one PHY on kumeran bus */
return -1;
- if (sc->phy.acquire(sc)) {
+ rv = sc->phy.acquire(sc);
+ if (rv != 0) {
device_printf(dev, "%s: failed to get semaphore\n", __func__);
- return -1;
+ return rv;
}
if ((reg & MII_ADDRMASK) < GG82563_MIN_ALT_REG)
@@ -11793,9 +11796,10 @@
if (phy != 1) /* Only one PHY on kumeran bus */
return -1;
- if (sc->phy.acquire(sc)) {
+ rv = sc->phy.acquire(sc);
+ if (rv != 0) {
device_printf(dev, "%s: failed to get semaphore\n", __func__);
- return -1;
+ return rv;
}
if ((reg & MII_ADDRMASK) < GG82563_MIN_ALT_REG)
@@ -11848,9 +11852,10 @@
uint16_t page = reg >> BME1000_PAGE_SHIFT;
int rv;
- if (sc->phy.acquire(sc)) {
+ rv = sc->phy.acquire(sc);
+ if (rv != 0) {
device_printf(dev, "%s: failed to get semaphore\n", __func__);
- return -1;
+ return rv;
}
if ((sc->sc_type != WM_T_82574) && (sc->sc_type != WM_T_82583))
@@ -11895,9 +11900,10 @@
uint16_t page = reg >> BME1000_PAGE_SHIFT;
int rv;
- if (sc->phy.acquire(sc)) {
+ rv = sc->phy.acquire(sc);
+ if (rv != 0) {
device_printf(dev, "%s: failed to get semaphore\n", __func__);
- return -1;
+ return rv;
}
if ((sc->sc_type != WM_T_82574) && (sc->sc_type != WM_T_82583))
@@ -12113,9 +12119,11 @@
DPRINTF(sc, WM_DEBUG_GMII, ("%s: %s called\n",
device_xname(dev), __func__));
- if (sc->phy.acquire(sc)) {
+
+ rv = sc->phy.acquire(sc);
+ if (rv != 0) {
device_printf(dev, "%s: failed to get semaphore\n", __func__);
- return -1;
+ return rv;
}
rv = wm_gmii_hv_readreg_locked(dev, phy, reg, val);
@@ -12178,9 +12186,10 @@
DPRINTF(sc, WM_DEBUG_GMII, ("%s: %s called\n",
device_xname(dev), __func__));
- if (sc->phy.acquire(sc)) {
+ rv = sc->phy.acquire(sc);
+ if (rv != 0) {
device_printf(dev, "%s: failed to get semaphore\n", __func__);
- return -1;
+ return rv;
}
rv = wm_gmii_hv_writereg_locked(dev, phy, reg, val);
@@ -12261,9 +12270,10 @@
struct wm_softc *sc = device_private(dev);
int rv;
- if (sc->phy.acquire(sc) != 0) {
+ rv = sc->phy.acquire(sc);
+ if (rv != 0) {
device_printf(dev, "%s: failed to get semaphore\n", __func__);
- return -1;
+ return rv;
}
#ifdef DIAGNOSTIC
@@ -12292,9 +12302,10 @@
struct wm_softc *sc = device_private(dev);
int rv;
- if (sc->phy.acquire(sc) != 0) {
+ rv = sc->phy.acquire(sc);
+ if (rv != 0) {
device_printf(dev, "%s: failed to get semaphore\n", __func__);
- return -1;
+ return rv;
}
#ifdef DIAGNOSTIC
@@ -12325,9 +12336,10 @@
int rv;
/* Acquire semaphore */
- if (sc->phy.acquire(sc)) {
+ rv = sc->phy.acquire(sc);
+ if (rv != 0) {
device_printf(dev, "%s: failed to get semaphore\n", __func__);
- return -1;
+ return rv;
}
/* Page select */
@@ -12360,9 +12372,10 @@
int offset, rv;
/* Acquire semaphore */
- if (sc->phy.acquire(sc)) {
+ rv = sc->phy.acquire(sc);
+ if (rv != 0) {
device_printf(dev, "%s: failed to get semaphore\n", __func__);
- return -1;
+ return rv;
}
/* Page select */
@@ -12645,9 +12658,10 @@
struct wm_softc *sc = device_private(dev);
int rv;
- if (sc->phy.acquire(sc)) {
+ rv = sc->phy.acquire(sc);
+ if (rv != 0) {
device_printf(dev, "%s: failed to get semaphore\n", __func__);
- return -1;
+ return rv;
}
rv = wm_sgmii_readreg_locked(dev, phy, reg, val);
@@ -12702,9 +12716,10 @@
struct wm_softc *sc = device_private(dev);
int rv;
- if (sc->phy.acquire(sc) != 0) {
+ rv = sc->phy.acquire(sc);
+ if (rv != 0) {
device_printf(dev, "%s: failed to get semaphore\n", __func__);
- return -1;
+ return rv;
}
rv = wm_sgmii_writereg_locked(dev, phy, reg, val);
@@ -13583,13 +13598,14 @@
wm_nvm_read_uwire(struct wm_softc *sc, int word, int wordcnt, uint16_t *data)
{
uint32_t reg, val;
- int i;
+ int i, rv;
DPRINTF(sc, WM_DEBUG_NVM, ("%s: %s called\n",
device_xname(sc->sc_dev), __func__));
- if (sc->nvm.acquire(sc) != 0)
- return -1;
+ rv = sc->nvm.acquire(sc);
+ if (rv != 0)
+ return rv;
for (i = 0; i < wordcnt; i++) {
/* Clear SK and DI. */
@@ -13747,13 +13763,14 @@
uint32_t reg, val;
int i;
uint8_t opc;
- int rv = 0;
+ int rv;
DPRINTF(sc, WM_DEBUG_NVM, ("%s: %s called\n",
device_xname(sc->sc_dev), __func__));
- if (sc->nvm.acquire(sc) != 0)
- return -1;
+ rv = sc->nvm.acquire(sc);
+ if (rv != 0)
+ return rv;
/* Clear SK and CS. */
reg = CSR_READ(sc, WMREG_EECD) & ~(EECD_SK | EECD_CS);
@@ -13821,13 +13838,14 @@
wm_nvm_read_eerd(struct wm_softc *sc, int offset, int wordcnt, uint16_t *data)
{
int i, eerd = 0;
- int rv = 0;
+ int rv;
DPRINTF(sc, WM_DEBUG_NVM, ("%s: %s called\n",
device_xname(sc->sc_dev), __func__));
- if (sc->nvm.acquire(sc) != 0)
- return -1;
+ rv = sc->nvm.acquire(sc);
+ if (rv != 0)
+ return rv;
for (i = 0; i < wordcnt; i++) {
eerd = ((offset + i) << EERD_ADDR_SHIFT) | EERD_START;
@@ -14228,7 +14246,7 @@
static int
wm_nvm_read_ich8(struct wm_softc *sc, int offset, int words, uint16_t *data)
{
- int32_t rv = 0;
+ int rv;
uint32_t flash_bank = 0;
uint32_t act_offset = 0;
uint32_t bank_offset = 0;
@@ -14238,8 +14256,9 @@
DPRINTF(sc, WM_DEBUG_NVM, ("%s: %s called\n",
device_xname(sc->sc_dev), __func__));
- if (sc->nvm.acquire(sc) != 0)
- return -1;
+ rv = sc->nvm.acquire(sc);
+ if (rv != 0)
+ return rv;
/*
* We need to know which is the valid flash bank. In the event
@@ -14288,7 +14307,7 @@
static int
wm_nvm_read_spt(struct wm_softc *sc, int offset, int words, uint16_t *data)
{
- int32_t rv = 0;
+ int rv;
uint32_t flash_bank = 0;
uint32_t act_offset = 0;
uint32_t bank_offset = 0;
Home |
Main Index |
Thread Index |
Old Index