Remove SET/CLR/ISSET macros from Octeon code. The kernel already provides

these macros.

This diff from brad@
built test and ok yasuoka@

7 files changed, 7 insertions, 49 deletions

diff --git a/sys/arch/octeon/dev/cn30xxasx.c b/sys/arch/octeon/dev/cn30xxasx.c
index ebe5951dfbb..9d75b1069d9 100644
--- a/sys/arch/octeon/dev/cn30xxasx.c
+++ b/sys/arch/octeon/dev/cn30xxasx.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cn30xxasx.c,v 1.1 2011/06/16 11:22:30 syuu Exp $	*/
+/*	$OpenBSD: cn30xxasx.c,v 1.2 2011/06/24 02:13:23 yasuoka Exp $	*/
 
 /*
  * Copyright (c) 2007 Internet Initiative Japan, Inc.
@@ -37,12 +37,6 @@
 #include <octeon/dev/cn30xxasxreg.h>
 #include <octeon/dev/cn30xxasxvar.h>
 
-#ifndef SET
-#define	SET(t, f)	((t) |= (f))
-#define	ISSET(t, f)	((t) & (f))
-#define	CLR(t, f)	((t) &= ~(f))
-#endif
-
 #ifdef OCTEON_ETH_DEBUG
 void			cn30xxasx_intr_evcnt_attach(struct cn30xxasx_softc *);
 void			cn30xxasx_intr_rml(void *);
diff --git a/sys/arch/octeon/dev/cn30xxgmx.c b/sys/arch/octeon/dev/cn30xxgmx.c
index 14ad35c54b5..590425712f9 100644
--- a/sys/arch/octeon/dev/cn30xxgmx.c
+++ b/sys/arch/octeon/dev/cn30xxgmx.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cn30xxgmx.c,v 1.1 2011/06/16 11:22:30 syuu Exp $	*/
+/*	$OpenBSD: cn30xxgmx.c,v 1.2 2011/06/24 02:13:23 yasuoka Exp $	*/
 
 /*
  * Copyright (c) 2007 Internet Initiative Japan, Inc.
@@ -55,12 +55,6 @@
 #define	dprintf(...)
 #define	OCTEON_ETH_KASSERT	KASSERT
 
-#ifndef SET
-#define	SET(t, f)	((t) |= (f))
-#define	ISSET(t, f)	((t) & (f))
-#define	CLR(t, f)	((t) &= ~(f))
-#endif
-
 #define	ADDR2UINT64(u, a) \
 	do { \
 		u = \
diff --git a/sys/arch/octeon/dev/cn30xxipdvar.h b/sys/arch/octeon/dev/cn30xxipdvar.h
index 140d9de62c2..6808bc17ab1 100644
--- a/sys/arch/octeon/dev/cn30xxipdvar.h
+++ b/sys/arch/octeon/dev/cn30xxipdvar.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cn30xxipdvar.h,v 1.1 2011/06/16 11:22:30 syuu Exp $	*/
+/*	$OpenBSD: cn30xxipdvar.h,v 1.2 2011/06/24 02:13:23 yasuoka Exp $	*/
 
 /*
  * Copyright (c) 2007 Internet Initiative Japan, Inc.
@@ -29,12 +29,6 @@
 #ifndef _CN30XXIPDVAR_H_
 #define _CN30XXIPDVAR_H_
 
-#ifndef SET
-#define	SET(t, f)	((t) |= (f))
-#define	ISSET(t, f)	((t) & (f))
-#define	CLR(t, f)	((t) &= ~(f))
-#endif
-
 /* XXX */
 struct cn30xxipd_softc {
 	int			sc_port;
diff --git a/sys/arch/octeon/dev/cn30xxpip.c b/sys/arch/octeon/dev/cn30xxpip.c
index 1749f612e4d..5c3e1742a0d 100644
--- a/sys/arch/octeon/dev/cn30xxpip.c
+++ b/sys/arch/octeon/dev/cn30xxpip.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cn30xxpip.c,v 1.1 2011/06/16 11:22:30 syuu Exp $	*/
+/*	$OpenBSD: cn30xxpip.c,v 1.2 2011/06/24 02:13:23 yasuoka Exp $	*/
 
 /*
  * Copyright (c) 2007 Internet Initiative Japan, Inc.
@@ -39,12 +39,6 @@
 #include <octeon/dev/cn30xxpipreg.h>
 #include <octeon/dev/cn30xxpipvar.h>
 
-#ifndef SET
-#define	SET(t, f)	((t) |= (f))
-#define	ISSET(t, f)	((t) & (f))
-#define	CLR(t, f)	((t) &= ~(f))
-#endif
-
 #ifdef OCTEON_ETH_DEBUG
 struct cn30xxpip_softc *__cn30xxpip_softc;
 
diff --git a/sys/arch/octeon/dev/cn30xxpkovar.h b/sys/arch/octeon/dev/cn30xxpkovar.h
index d752634d4f8..24e5bcfc648 100644
--- a/sys/arch/octeon/dev/cn30xxpkovar.h
+++ b/sys/arch/octeon/dev/cn30xxpkovar.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cn30xxpkovar.h,v 1.1 2011/06/16 11:22:30 syuu Exp $	*/
+/*	$OpenBSD: cn30xxpkovar.h,v 1.2 2011/06/24 02:13:23 yasuoka Exp $	*/
 
 /*
  * Copyright (c) 2007 Internet Initiative Japan, Inc.
@@ -38,12 +38,6 @@
 #include <octeon/dev/cn30xxfauvar.h>
 #include <octeon/dev/cn30xxpkoreg.h>
 
-#ifndef SET
-#define	SET(t, f)	((t) |= (f))
-#define	ISSET(t, f)	((t) & (f))
-#define	CLR(t, f)	((t) &= ~(f))
-#endif
-
 #define FAU_OP_SIZE_8	0
 #define FAU_OP_SIZE_16	1
 #define FAU_OP_SIZE_32	2   
diff --git a/sys/arch/octeon/dev/cn30xxsmivar.h b/sys/arch/octeon/dev/cn30xxsmivar.h
index 966e5a0a522..d89ecac0d15 100644
--- a/sys/arch/octeon/dev/cn30xxsmivar.h
+++ b/sys/arch/octeon/dev/cn30xxsmivar.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cn30xxsmivar.h,v 1.1 2011/06/16 11:22:30 syuu Exp $	*/
+/*	$OpenBSD: cn30xxsmivar.h,v 1.2 2011/06/24 02:13:23 yasuoka Exp $	*/
 
 /*
  * Copyright (c) 2007 Internet Initiative Japan, Inc.
@@ -29,12 +29,6 @@
 #ifndef _CN30XXSMIVAR_H_
 #define _CN30XXSMIVAR_H_
 
-#ifndef SET
-#define	SET(t, f)	((t) |= (f))
-#define	ISSET(t, f)	((t) & (f))
-#define	CLR(t, f)	((t) &= ~(f))
-#endif
-
 /* XXX */
 struct cn30xxsmi_softc {
 	int			sc_port;
diff --git a/sys/arch/octeon/dev/if_cnmac.c b/sys/arch/octeon/dev/if_cnmac.c
index f89f8d13e3a..f05c74dc0bf 100644
--- a/sys/arch/octeon/dev/if_cnmac.c
+++ b/sys/arch/octeon/dev/if_cnmac.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_cnmac.c,v 1.4 2011/06/22 07:29:06 yasuoka Exp $	*/
+/*	$OpenBSD: if_cnmac.c,v 1.5 2011/06/24 02:13:23 yasuoka Exp $	*/
 
 /*
  * Copyright (c) 2007 Internet Initiative Japan, Inc.
@@ -100,12 +100,6 @@
 #include <octeon/dev/iobusvar.h>
 #include <octeon/dev/if_cnmacvar.h>
 
-#ifndef SET
-#define	SET(t, f)	((t) |= (f))
-#define	ISSET(t, f)	((t) & (f))
-#define	CLR(t, f)	((t) &= ~(f))
-#endif
-
 #ifdef OCTEON_ETH_DEBUG
 #define	OCTEON_ETH_KASSERT(x)	KASSERT(x)
 #define	OCTEON_ETH_KDASSERT(x)	KDASSERT(x)