Module Name: src
Committed By: leot
Date: Thu Dec 29 19:22:51 UTC 2016
Modified Files:
src/sys/dev/pci: if_alcreg.h
Log Message:
Do not access `sc' directly via the CSR_{READ,WRITE}_[124] macros.
Patch provided by Amol via PR kern/51708.
ok <Riastradh>
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/dev/pci/if_alcreg.h
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/pci/if_alcreg.h
diff -u src/sys/dev/pci/if_alcreg.h:1.5 src/sys/dev/pci/if_alcreg.h:1.6
--- src/sys/dev/pci/if_alcreg.h:1.5 Tue Nov 24 23:30:04 2015
+++ src/sys/dev/pci/if_alcreg.h Thu Dec 29 19:22:51 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: if_alcreg.h,v 1.5 2015/11/24 23:30:04 leot Exp $ */
+/* $NetBSD: if_alcreg.h,v 1.6 2016/12/29 19:22:51 leot Exp $ */
/* $OpenBSD: if_alcreg.h,v 1.1 2009/08/08 09:31:13 kevlo Exp $ */
/*-
* Copyright (c) 2009, Pyun YongHyeon <yong...@freebsd.org>
@@ -1488,15 +1488,15 @@ struct alc_softc {
/* Register access macros. */
#define CSR_WRITE_4(_sc, reg, val) \
- bus_space_write_4((sc)->sc_mem_bt, (sc)->sc_mem_bh, (reg), (val))
+ bus_space_write_4((_sc)->sc_mem_bt, (_sc)->sc_mem_bh, (reg), (val))
#define CSR_WRITE_2(_sc, reg, val) \
- bus_space_write_2((sc)->sc_mem_bt, (sc)->sc_mem_bh, (reg), (val))
+ bus_space_write_2((_sc)->sc_mem_bt, (_sc)->sc_mem_bh, (reg), (val))
#define CSR_WRITE_1(_sc, reg, val) \
- bus_space_write_1((sc)->sc_mem_bt, (sc)->sc_mem_bh, (reg), (val))
+ bus_space_write_1((_sc)->sc_mem_bt, (_sc)->sc_mem_bh, (reg), (val))
#define CSR_READ_2(_sc, reg) \
- bus_space_read_2((sc)->sc_mem_bt, (sc)->sc_mem_bh, (reg))
+ bus_space_read_2((_sc)->sc_mem_bt, (_sc)->sc_mem_bh, (reg))
#define CSR_READ_4(_sc, reg) \
- bus_space_read_4((sc)->sc_mem_bt, (sc)->sc_mem_bh, (reg))
+ bus_space_read_4((_sc)->sc_mem_bt, (_sc)->sc_mem_bh, (reg))
#define ALC_RXCHAIN_RESET(_sc) \
do { \
