Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/dev/pci cosmetic.
details: https://anonhg.NetBSD.org/src/rev/1179a83e737b
branches: trunk
changeset: 350270:1179a83e737b
user: nonaka <nonaka%NetBSD.org@localhost>
date: Mon Jan 09 08:10:25 2017 +0000
description:
cosmetic.
diffstat:
sys/dev/pci/if_iwm.c | 20 +++++++++-----------
1 files changed, 9 insertions(+), 11 deletions(-)
diffs (55 lines):
diff -r edc8ca71cf07 -r 1179a83e737b sys/dev/pci/if_iwm.c
--- a/sys/dev/pci/if_iwm.c Mon Jan 09 08:05:14 2017 +0000
+++ b/sys/dev/pci/if_iwm.c Mon Jan 09 08:10:25 2017 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: if_iwm.c,v 1.52 2017/01/09 08:05:14 nonaka Exp $ */
+/* $NetBSD: if_iwm.c,v 1.53 2017/01/09 08:10:25 nonaka Exp $ */
/* OpenBSD: if_iwm.c,v 1.147 2016/11/17 14:12:33 stsp Exp */
#define IEEE80211_NO_HT
/*
@@ -107,7 +107,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_iwm.c,v 1.52 2017/01/09 08:05:14 nonaka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_iwm.c,v 1.53 2017/01/09 08:10:25 nonaka Exp $");
#include <sys/param.h>
#include <sys/conf.h>
@@ -951,7 +951,7 @@
static int
iwm_read_mem(struct iwm_softc *sc, uint32_t addr, void *buf, int dwords)
{
- int offs, err = 0;
+ int offs;
uint32_t *vals = buf;
if (iwm_nic_lock(sc)) {
@@ -959,10 +959,9 @@
for (offs = 0; offs < dwords; offs++)
vals[offs] = IWM_READ(sc, IWM_HBUS_TARG_MEM_RDAT);
iwm_nic_unlock(sc);
- } else {
- err = EBUSY;
- }
- return err;
+ return 0;
+ }
+ return EBUSY;
}
#endif
@@ -980,10 +979,9 @@
IWM_WRITE(sc, IWM_HBUS_TARG_MEM_WDAT, val);
}
iwm_nic_unlock(sc);
- } else {
- return EBUSY;
- }
- return 0;
+ return 0;
+ }
+ return EBUSY;
}
static int
Home |
Main Index |
Thread Index |
Old Index