Download raw body.
remove unused DPRINTF macros
diff --git sys/arch/amd64/stand/libsa/exec_i386.c sys/arch/amd64/stand/libsa/exec_i386.c
index 8dc0b924fb7..e722f6fc7ab 100644
--- sys/arch/amd64/stand/libsa/exec_i386.c
+++ sys/arch/amd64/stand/libsa/exec_i386.c
@@ -47,14 +47,6 @@
#include "softraid_amd64.h"
#endif
-#define BOOT_DEBUG
-
-#ifdef BOOT_DEBUG
-#define DPRINTF(x...) do { printf(x); } while(0)
-#else
-#define DPRINTF(x...)
-#endif /* BOOT_DEBUG */
-
#define LEGACY_KERNEL_ENTRY_POINT 0xffffffff81001000ULL
typedef void (*startfuncp)(int, int, int, int, int, int, int, int)
diff --git sys/arch/armv7/exynos/tps65090.c sys/arch/armv7/exynos/tps65090.c
index 55581ecb4ca..766adb6a07b 100644
--- sys/arch/armv7/exynos/tps65090.c
+++ sys/arch/armv7/exynos/tps65090.c
@@ -56,12 +56,6 @@
#define NFET 7
-#ifdef DEBUG
-#define DPRINTF(x) printf x
-#else
-#define DPRINTF(x)
-#endif
-
struct tps65090_softc {
struct device sc_dev;
i2c_tag_t sc_tag;
diff --git sys/arch/sh/dev/shpcic.c sys/arch/sh/dev/shpcic.c
index c139fe4a83b..8c0e841f434 100644
--- sys/arch/sh/dev/shpcic.c
+++ sys/arch/sh/dev/shpcic.c
@@ -46,13 +46,6 @@
#include <machine/bus.h>
#include <machine/intr.h>
-#if defined(SHPCIC_DEBUG)
-int shpcic_debug = 0;
-#define DPRINTF(arg) if (shpcic_debug) printf arg
-#else
-#define DPRINTF(arg)
-#endif
-
#define PCI_MODE1_ENABLE 0x80000000UL
static const struct shpcic_product {
diff --git sys/arch/sparc64/dev/vcc.c sys/arch/sparc64/dev/vcc.c
index cfafffda1b5..a7452c1a343 100644
--- sys/arch/sparc64/dev/vcc.c
+++ sys/arch/sparc64/dev/vcc.c
@@ -27,12 +27,6 @@
#include <sparc64/dev/cbusvar.h>
-#ifdef VCC_DEBUG
-#define DPRINTF(x) printf x
-#else
-#define DPRINTF(x)
-#endif
-
struct vcc_softc {
struct device sc_dv;
bus_space_tag_t sc_bustag;
diff --git sys/arch/sparc64/dev/vds.c sys/arch/sparc64/dev/vds.c
index f0ea227bd96..2d1e41da153 100644
--- sys/arch/sparc64/dev/vds.c
+++ sys/arch/sparc64/dev/vds.c
@@ -27,12 +27,6 @@
#include <sparc64/dev/cbusvar.h>
-#ifdef VDS_DEBUG
-#define DPRINTF(x) printf x
-#else
-#define DPRINTF(x)
-#endif
-
struct vds_softc {
struct device sc_dv;
bus_space_tag_t sc_bustag;
diff --git sys/arch/sparc64/dev/vldc.c sys/arch/sparc64/dev/vldc.c
index 5d738b49b0e..66e259044f6 100644
--- sys/arch/sparc64/dev/vldc.c
+++ sys/arch/sparc64/dev/vldc.c
@@ -27,12 +27,6 @@
#include <sparc64/dev/cbusvar.h>
-#ifdef VLDC_DEBUG
-#define DPRINTF(x) printf x
-#else
-#define DPRINTF(x)
-#endif
-
struct vldc_softc {
struct device sc_dv;
bus_space_tag_t sc_bustag;
diff --git sys/arch/sparc64/dev/vsw.c sys/arch/sparc64/dev/vsw.c
index b18e351fbbd..0047dc0dd6b 100644
--- sys/arch/sparc64/dev/vsw.c
+++ sys/arch/sparc64/dev/vsw.c
@@ -27,12 +27,6 @@
#include <sparc64/dev/cbusvar.h>
-#ifdef VSW_DEBUG
-#define DPRINTF(x) printf x
-#else
-#define DPRINTF(x)
-#endif
-
struct vsw_softc {
struct device sc_dv;
bus_space_tag_t sc_bustag;
diff --git sys/dev/cardbus/if_fxp_cardbus.c sys/dev/cardbus/if_fxp_cardbus.c
index b637bacd60f..12d412a1048 100644
--- sys/dev/cardbus/if_fxp_cardbus.c
+++ sys/dev/cardbus/if_fxp_cardbus.c
@@ -86,12 +86,6 @@ const struct pci_matchid fxp_cardbus_devices[] = {
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_8255X },
};
-#ifdef CBB_DEBUG
-#define DPRINTF(X) printf X
-#else
-#define DPRINTF(X)
-#endif
-
int
fxp_cardbus_match(struct device *parent, void *match, void *aux)
{
diff --git sys/dev/fdt/if_mvneta.c sys/dev/fdt/if_mvneta.c
index dbfb10cb8b4..d5834372e74 100644
--- sys/dev/fdt/if_mvneta.c
+++ sys/dev/fdt/if_mvneta.c
@@ -73,11 +73,9 @@
#endif
#ifdef MVNETA_DEBUG
-#define DPRINTF(x) if (mvneta_debug) printf x
#define DPRINTFN(n,x) if (mvneta_debug >= (n)) printf x
int mvneta_debug = MVNETA_DEBUG;
#else
-#define DPRINTF(x)
#define DPRINTFN(n,x)
#endif
diff --git sys/dev/fdt/sxiccmu.c sys/dev/fdt/sxiccmu.c
index f48378ce938..88fb15250bc 100644
--- sys/dev/fdt/sxiccmu.c
+++ sys/dev/fdt/sxiccmu.c
@@ -38,12 +38,6 @@
/* R40 */
#define R40_GMAC_CLK_REG 0x0164
-#ifdef DEBUG_CCMU
-#define DPRINTF(x) do { printf x; } while (0)
-#else
-#define DPRINTF(x)
-#endif
-
struct sxiccmu_ccu_bit {
uint16_t reg;
uint8_t bit;
diff --git sys/dev/ic/ac97.c sys/dev/ic/ac97.c
index c8ab7ea30d1..c4223b6377d 100644
--- sys/dev/ic/ac97.c
+++ sys/dev/ic/ac97.c
@@ -582,7 +582,6 @@ int ac97_write(struct ac97_softc *, u_int8_t, u_int16_t);
#ifdef AUDIO_DEBUG
-#define DPRINTF(x) if (ac97debug) printf x
#define DPRINTFN(n,x) if (ac97debug>(n)) printf x
#ifdef AC97_DEBUG
int ac97debug = 1;
@@ -590,7 +589,6 @@ int ac97debug = 1;
int ac97debug = 0;
#endif
#else
-#define DPRINTF(x)
#define DPRINTFN(n,x)
#endif
diff --git sys/dev/ic/re.c sys/dev/ic/re.c
index a5321b1e2e3..363fdc6a1a4 100644
--- sys/dev/ic/re.c
+++ sys/dev/ic/re.c
@@ -148,13 +148,6 @@
#include <dev/ic/rtl81x9reg.h>
#include <dev/ic/revar.h>
-#ifdef RE_DEBUG
-int redebug = 0;
-#define DPRINTF(x) do { if (redebug) printf x; } while (0)
-#else
-#define DPRINTF(x)
-#endif
-
static inline void re_set_bufaddr(struct rl_desc *, bus_addr_t);
int re_encap(struct rl_softc *, unsigned int, struct mbuf *);
diff --git sys/dev/isa/ess_isapnp.c sys/dev/isa/ess_isapnp.c
index 7ec1ffc1fdf..a450278d00c 100644
--- sys/dev/isa/ess_isapnp.c
+++ sys/dev/isa/ess_isapnp.c
@@ -44,12 +44,6 @@
#include <dev/isa/essreg.h>
#include <dev/isa/essvar.h>
-#ifdef ESS_ISAPNP_DEBUG
-#define DPRINTF(x) printf x
-#else
-#define DPRINTF(x)
-#endif
-
int ess_isapnp_probe(struct device *, void *, void *);
void ess_isapnp_attach(struct device *, struct device *, void *);
diff --git sys/dev/isa/i82365_isa.c sys/dev/isa/i82365_isa.c
index 45865798ce8..3fad8581c44 100644
--- sys/dev/isa/i82365_isa.c
+++ sys/dev/isa/i82365_isa.c
@@ -51,12 +51,6 @@
#include <dev/ic/i82365var.h>
#include <dev/isa/i82365_isavar.h>
-#ifdef PCICISADEBUG
-#define DPRINTF(arg) printf arg;
-#else
-#define DPRINTF(arg)
-#endif
-
int pcic_isa_probe(struct device *, void *, void *);
void pcic_isa_attach(struct device *, struct device *, void *);
diff --git sys/dev/isa/i82365_isapnp.c sys/dev/isa/i82365_isapnp.c
index fe10f1cc313..6006d7a9e55 100644
--- sys/dev/isa/i82365_isapnp.c
+++ sys/dev/isa/i82365_isapnp.c
@@ -55,14 +55,6 @@
#include <dev/ic/i82365var.h>
#include <dev/isa/i82365_isavar.h>
-#undef DPRINTF
-#ifdef PCICISADEBUG
-int pcicisapnp_debug = 0 /* XXX */ ;
-#define DPRINTF(arg) if (pcicisapnp_debug) printf arg;
-#else
-#define DPRINTF(arg)
-#endif
-
int pcic_isapnp_match(struct device *, void *, void *);
void pcic_isapnp_attach(struct device *, struct device *, void *);
diff --git sys/dev/pci/if_age.c sys/dev/pci/if_age.c
index 51ef8752e24..cf930277d4e 100644
--- sys/dev/pci/if_age.c
+++ sys/dev/pci/if_age.c
@@ -117,7 +117,6 @@ struct cfdriver age_cd = {
};
int agedebug = 0;
-#define DPRINTF(x) do { if (agedebug) printf x; } while (0)
#define AGE_CSUM_FEATURES (M_TCP_CSUM_OUT | M_UDP_CSUM_OUT)
diff --git sys/dev/pci/if_alc.c sys/dev/pci/if_alc.c
index 292ae7c3301..685c3108209 100644
--- sys/dev/pci/if_alc.c
+++ sys/dev/pci/if_alc.c
@@ -157,7 +157,6 @@ struct cfdriver alc_cd = {
};
int alcdebug = 0;
-#define DPRINTF(x) do { if (alcdebug) printf x; } while (0)
#define ALC_CSUM_FEATURES (M_TCP_CSUM_OUT | M_UDP_CSUM_OUT)
diff --git sys/dev/pci/if_ale.c sys/dev/pci/if_ale.c
index 1ad8e88d6c2..aa8811748ae 100644
--- sys/dev/pci/if_ale.c
+++ sys/dev/pci/if_ale.c
@@ -121,7 +121,6 @@ struct cfdriver ale_cd = {
};
int aledebug = 0;
-#define DPRINTF(x) do { if (aledebug) printf x; } while (0)
#define ALE_CSUM_FEATURES (M_TCP_CSUM_OUT | M_UDP_CSUM_OUT)
diff --git sys/dev/pci/if_bce.c sys/dev/pci/if_bce.c
index d07480734c5..2e3cfa045be 100644
--- sys/dev/pci/if_bce.c
+++ sys/dev/pci/if_bce.c
@@ -144,21 +144,6 @@ int bce_mediachange(struct ifnet *);
void bce_mediastatus(struct ifnet *, struct ifmediareq *);
void bce_tick(void *);
-#ifdef BCE_DEBUG
-#define DPRINTF(x) do { \
- if (bcedebug) \
- printf x; \
-} while (/* CONSTCOND */ 0)
-#define DPRINTFN(n,x) do { \
- if (bcedebug >= (n)) \
- printf x; \
-} while (/* CONSTCOND */ 0)
-int bcedebug = 0;
-#else
-#define DPRINTF(x)
-#define DPRINTFN(n,x)
-#endif
-
const struct cfattach bce_ca = {
sizeof(struct bce_softc), bce_probe, bce_attach, NULL, bce_activate
};
diff --git sys/dev/pci/if_bge.c sys/dev/pci/if_bge.c
index a1b4a9b619e..8ac05ffe533 100644
--- sys/dev/pci/if_bge.c
+++ sys/dev/pci/if_bge.c
@@ -255,11 +255,9 @@ enum {
#endif
#ifdef BGE_DEBUG
-#define DPRINTF(x) do { if (bgedebug) printf x; } while (0)
#define DPRINTFN(n,x) do { if (bgedebug >= (n)) printf x; } while (0)
int bgedebug = 0;
#else
-#define DPRINTF(x)
#define DPRINTFN(n,x)
#endif
diff --git sys/dev/pci/if_jme.c sys/dev/pci/if_jme.c
index fcbe0bf45d9..342edbcfa94 100644
--- sys/dev/pci/if_jme.c
+++ sys/dev/pci/if_jme.c
@@ -131,7 +131,6 @@ struct cfdriver jme_cd = {
};
int jmedebug = 0;
-#define DPRINTF(x) do { if (jmedebug) printf x; } while (0)
/*
* Read a PHY register on the MII of the JMC250.
diff --git sys/dev/pci/if_lge.c sys/dev/pci/if_lge.c
index 4753418bd89..f6d027cc50f 100644
--- sys/dev/pci/if_lge.c
+++ sys/dev/pci/if_lge.c
@@ -144,11 +144,9 @@ int lge_list_rx_init(struct lge_softc *);
int lge_list_tx_init(struct lge_softc *);
#ifdef LGE_DEBUG
-#define DPRINTF(x) if (lgedebug) printf x
#define DPRINTFN(n,x) if (lgedebug >= (n)) printf x
int lgedebug = 0;
#else
-#define DPRINTF(x)
#define DPRINTFN(n,x)
#endif
diff --git sys/dev/pci/if_msk.c sys/dev/pci/if_msk.c
index 3822d61d753..6f87d1af454 100644
--- sys/dev/pci/if_msk.c
+++ sys/dev/pci/if_msk.c
@@ -208,7 +208,6 @@ void msk_tick(void *);
void msk_fill_rx_tick(void *);
#ifdef MSK_DEBUG
-#define DPRINTF(x) if (mskdebug) printf x
#define DPRINTFN(n,x) if (mskdebug >= (n)) printf x
int mskdebug = 0;
@@ -216,7 +215,6 @@ void msk_dump_txdesc(struct msk_tx_desc *, int);
void msk_dump_mbuf(struct mbuf *);
void msk_dump_bytes(const char *, int);
#else
-#define DPRINTF(x)
#define DPRINTFN(n,x)
#endif
diff --git sys/dev/pci/if_nxe.c sys/dev/pci/if_nxe.c
index b28467d9a5c..e179e94daae 100644
--- sys/dev/pci/if_nxe.c
+++ sys/dev/pci/if_nxe.c
@@ -47,12 +47,8 @@
#include <netinet/if_ether.h>
#ifdef NXE_DEBUG
-int nxedebug = 0;
-
-#define DPRINTF(l, f...) do { if (nxedebug & (l)) printf(f); } while (0)
#define DASSERT(_a) assert(_a)
#else
-#define DPRINTF(l, f...)
#define DASSERT(_a)
#endif
diff --git sys/dev/pci/if_rge.c sys/dev/pci/if_rge.c
index 4ead3ee1c7c..673ee54f81e 100644
--- sys/dev/pci/if_rge.c
+++ sys/dev/pci/if_rge.c
@@ -54,13 +54,6 @@
#include <dev/pci/if_rgereg.h>
-#ifdef RGE_DEBUG
-#define DPRINTF(x) do { if (rge_debug > 0) printf x; } while (0)
-int rge_debug = 0;
-#else
-#define DPRINTF(x)
-#endif
-
int rge_match(struct device *, void *, void *);
void rge_attach(struct device *, struct device *, void *);
int rge_activate(struct device *, int);
diff --git sys/dev/pci/if_sk.c sys/dev/pci/if_sk.c
index d9a08eb4646..c6ee8136549 100644
--- sys/dev/pci/if_sk.c
+++ sys/dev/pci/if_sk.c
@@ -169,7 +169,6 @@ void sk_tick(void *);
void sk_yukon_tick(void *);
#ifdef SK_DEBUG
-#define DPRINTF(x) if (skdebug) printf x
#define DPRINTFN(n,x) if (skdebug >= (n)) printf x
int skdebug = 0;
@@ -177,7 +176,6 @@ void sk_dump_txdesc(struct sk_tx_desc *, int);
void sk_dump_mbuf(struct mbuf *);
void sk_dump_bytes(const char *, int);
#else
-#define DPRINTF(x)
#define DPRINTFN(n,x)
#endif
diff --git sys/dev/pci/if_vte.c sys/dev/pci/if_vte.c
index 6493bd653a0..95bc5b92adf 100644
--- sys/dev/pci/if_vte.c
+++ sys/dev/pci/if_vte.c
@@ -107,9 +107,6 @@ struct cfdriver vte_cd = {
NULL, "vte", DV_IFNET
};
-int vtedebug = 0;
-#define DPRINTF(x) do { if (vtedebug) printf x; } while (0)
-
int
vte_miibus_readreg(struct device *dev, int phy, int reg)
{
diff --git sys/dev/pci/if_xge.c sys/dev/pci/if_xge.c
index dd327ba4d12..c94334b2a77 100644
--- sys/dev/pci/if_xge.c
+++ sys/dev/pci/if_xge.c
@@ -193,15 +193,6 @@ struct xge_softc {
int sc_nextrx; /* next descriptor to check */
};
-#ifdef XGE_DEBUG
-#define DPRINTF(x) do { if (xgedebug) printf x ; } while (0)
-#define DPRINTFN(n,x) do { if (xgedebug >= (n)) printf x ; } while (0)
-int xgedebug = 0;
-#else
-#define DPRINTF(x)
-#define DPRINTFN(n,x)
-#endif
-
int xge_match(struct device *, void *, void *);
void xge_attach(struct device *, struct device *, void *);
int xge_alloc_txmem(struct xge_softc *);
diff --git sys/dev/pci/mpii.c sys/dev/pci/mpii.c
index e6d4431424c..5a431b8a5f5 100644
--- sys/dev/pci/mpii.c
+++ sys/dev/pci/mpii.c
@@ -43,7 +43,6 @@
/* #define MPII_DEBUG */
#ifdef MPII_DEBUG
-#define DPRINTF(x...) do { if (mpii_debug) printf(x); } while(0)
#define DNPRINTF(n,x...) do { if (mpii_debug & (n)) printf(x); } while(0)
#define MPII_D_CMD (0x0001)
#define MPII_D_INTR (0x0002)
@@ -75,7 +74,6 @@ u_int32_t mpii_debug = 0
| MPII_D_MAP
;
#else
-#define DPRINTF(x...)
#define DNPRINTF(n,x...)
#endif
diff --git sys/dev/pv/viogpu.c sys/dev/pv/viogpu.c
index 09c0624cc13..e4f7018e041 100644
--- sys/dev/pv/viogpu.c
+++ sys/dev/pv/viogpu.c
@@ -31,12 +31,6 @@
#include <dev/wscons/wsdisplayvar.h>
#include <dev/rasops/rasops.h>
-#if VIRTIO_DEBUG
-#define DPRINTF(x...) printf(x)
-#else
-#define DPRINTF(x...)
-#endif
-
struct viogpu_softc;
int viogpu_match(struct device *, void *, void *);
diff --git sys/dev/usb/if_bwfm_usb.c sys/dev/usb/if_bwfm_usb.c
index bfd701bc609..bd7da9c2db7 100644
--- sys/dev/usb/if_bwfm_usb.c
+++ sys/dev/usb/if_bwfm_usb.c
@@ -53,11 +53,9 @@ static const struct usb_devno bwfm_usbdevs[] = {
};
#ifdef BWFM_DEBUG
-#define DPRINTF(x) do { if (bwfm_debug > 0) printf x; } while (0)
#define DPRINTFN(n, x) do { if (bwfm_debug >= (n)) printf x; } while (0)
static int bwfm_debug = 2;
#else
-#define DPRINTF(x) do { ; } while (0)
#define DPRINTFN(n, x) do { ; } while (0)
#endif
diff --git sys/dev/usb/if_kue.c sys/dev/usb/if_kue.c
index facadffb544..0ca266be766 100644
--- sys/dev/usb/if_kue.c
+++ sys/dev/usb/if_kue.c
@@ -97,11 +97,9 @@
#include <dev/usb/if_kuevar.h>
#ifdef KUE_DEBUG
-#define DPRINTF(x) do { if (kuedebug) printf x; } while (0)
#define DPRINTFN(n,x) do { if (kuedebug >= (n)) printf x; } while (0)
int kuedebug = 0;
#else
-#define DPRINTF(x)
#define DPRINTFN(n,x)
#endif
diff --git sys/dev/usb/if_ugl.c sys/dev/usb/if_ugl.c
index 8322c37e440..20444862a27 100644
--- sys/dev/usb/if_ugl.c
+++ sys/dev/usb/if_ugl.c
@@ -141,11 +141,9 @@ struct ugl_softc {
};
#ifdef UGL_DEBUG
-#define DPRINTF(x) do { if (ugldebug) printf x; } while (0)
#define DPRINTFN(n,x) do { if (ugldebug >= (n)) printf x; } while (0)
int ugldebug = 0;
#else
-#define DPRINTF(x)
#define DPRINTFN(n,x)
#endif
diff --git sys/dev/usb/if_upl.c sys/dev/usb/if_upl.c
index cf313727c98..2f3bbc551d6 100644
--- sys/dev/usb/if_upl.c
+++ sys/dev/usb/if_upl.c
@@ -131,11 +131,9 @@ struct upl_softc {
};
#ifdef UPL_DEBUG
-#define DPRINTF(x) do { if (upldebug) printf x; } while (0)
#define DPRINTFN(n,x) do { if (upldebug >= (n)) printf x; } while (0)
int upldebug = 0;
#else
-#define DPRINTF(x)
#define DPRINTFN(n,x)
#endif
diff --git sys/dev/usb/if_wi_usb.c sys/dev/usb/if_wi_usb.c
index b299bf87f57..519e88e8519 100644
--- sys/dev/usb/if_wi_usb.c
+++ sys/dev/usb/if_wi_usb.c
@@ -93,11 +93,9 @@ void wi_dump_data(void *buffer, int len);
void wi_usb_thread(void *arg);
#ifdef WI_USB_DEBUG
-#define DPRINTF(x) do { if (wi_usbdebug) printf x; } while (0)
#define DPRINTFN(n,x) do { if (wi_usbdebug >= (n)) printf x; } while (0)
int wi_usbdebug = 1;
#else
-#define DPRINTF(x)
#define DPRINTFN(n,x)
#endif
diff --git sys/dev/usb/uark.c sys/dev/usb/uark.c
index ce85a1c6488..7a0152ef838 100644
--- sys/dev/usb/uark.c
+++ sys/dev/usb/uark.c
@@ -27,14 +27,6 @@
#include <dev/usb/ucomvar.h>
-#ifdef UARK_DEBUG
-#define DPRINTFN(n, x) do { if (uarkdebug > (n)) printf x; } while (0)
-int uarkebug = 0;
-#else
-#define DPRINTFN(n, x)
-#endif
-#define DPRINTF(x) DPRINTFN(0, x)
-
#define UARKBUFSZ 256
#define UARK_IFACE_NO 0
diff --git sys/dev/usb/usb_mem.c sys/dev/usb/usb_mem.c
index e792e6a720e..67bd6f84e37 100644
--- sys/dev/usb/usb_mem.c
+++ sys/dev/usb/usb_mem.c
@@ -51,11 +51,9 @@
#include <dev/usb/usb_mem.h>
#ifdef USB_DEBUG
-#define DPRINTF(x) do { if (usbdebug) printf x; } while (0)
#define DPRINTFN(n,x) do { if (usbdebug>(n)) printf x; } while (0)
extern int usbdebug;
#else
-#define DPRINTF(x)
#define DPRINTFN(n,x)
#endif
diff --git sys/dev/usb/uslcom.c sys/dev/usb/uslcom.c
index 5dafbd1684c..b9e42df0b9b 100644
--- sys/dev/usb/uslcom.c
+++ sys/dev/usb/uslcom.c
@@ -27,14 +27,6 @@
#include <dev/usb/ucomvar.h>
-#ifdef USLCOM_DEBUG
-#define DPRINTFN(n, x) do { if (uslcomdebug > (n)) printf x; } while (0)
-int uslcomdebug = 0;
-#else
-#define DPRINTFN(n, x)
-#endif
-#define DPRINTF(x) DPRINTFN(0, x)
-
#define USLCOMBUFSZ 256
#define USLCOM_SET_DATA_BITS(x) (x << 8)
diff --git sys/dev/usb/uxrcom.c sys/dev/usb/uxrcom.c
index ed2af90950c..6576aa5826c 100644
--- sys/dev/usb/uxrcom.c
+++ sys/dev/usb/uxrcom.c
@@ -28,14 +28,6 @@
#include <dev/usb/ucomvar.h>
-#ifdef UXRCOM_DEBUG
-#define DPRINTFN(n, x) do { if (uxrcomdebug > (n)) printf x; } while (0)
-int uxrcomdebug = 0;
-#else
-#define DPRINTFN(n, x)
-#endif
-#define DPRINTF(x) DPRINTFN(0, x)
-
#define UXRCOMBUFSZ 64
#define UXRCOM_INTR_IFACE_NO 0
#define UXRCOM_DATA_IFACE_NO 1
diff --git sys/net/if_mpe.c sys/net/if_mpe.c
index 0ec06a262a0..b0e3298e6b0 100644
--- sys/net/if_mpe.c
+++ sys/net/if_mpe.c
@@ -42,14 +42,6 @@
#include <netmpls/mpls.h>
-
-
-#ifdef MPLS_DEBUG
-#define DPRINTF(x) do { if (mpedebug) printf x ; } while (0)
-#else
-#define DPRINTF(x)
-#endif
-
struct mpe_softc {
struct ifnet sc_if; /* the interface */
caddr_t sc_bpf;
diff --git sys/net/if_pflog.c sys/net/if_pflog.c
index 803d7e2e44b..905cf6d022c 100644
--- sys/net/if_pflog.c
+++ sys/net/if_pflog.c
@@ -65,12 +65,6 @@
#define PFLOGMTU (32768 + MHLEN + MLEN)
-#ifdef PFLOGDEBUG
-#define DPRINTF(x) do { if (pflogdebug) printf x ; } while (0)
-#else
-#define DPRINTF(x)
-#endif
-
void pflogattach(int);
int pflogoutput(struct ifnet *, struct mbuf *, struct sockaddr *,
struct rtentry *);
diff --git sys/net/if_pflow.c sys/net/if_pflow.c
index fced85a3186..200f7aea123 100644
--- sys/net/if_pflow.c
+++ sys/net/if_pflow.c
@@ -50,12 +50,6 @@
#define PFLOW_MINMTU \
(sizeof(struct pflow_header) + sizeof(struct pflow_flow))
-#ifdef PFLOWDEBUG
-#define DPRINTF(x) do { printf x ; } while (0)
-#else
-#define DPRINTF(x)
-#endif
-
SMR_SLIST_HEAD(, pflow_softc) pflowif_list;
enum pflowstat_counters {
diff --git sys/net/if_pppx.c sys/net/if_pppx.c
index fd065ca5225..0bceb0d40b5 100644
--- sys/net/if_pppx.c
+++ sys/net/if_pppx.c
@@ -86,20 +86,6 @@
#error PIPEX option not enabled
#endif
-#ifdef PPPX_DEBUG
-#define PPPX_D_INIT (1<<0)
-
-int pppxdebug = 0;
-
-#define DPRINTF(_m, _p...) do { \
- if (ISSET(pppxdebug, (_m))) \
- printf(_p); \
- } while (0)
-#else
-#define DPRINTF(_m, _p...) /* _m, _p */
-#endif
-
-
struct pppx_if;
/*
diff --git sys/net/if_veb.c sys/net/if_veb.c
index a8812bc1cb0..1bc89ddad4b 100644
--- sys/net/if_veb.c
+++ sys/net/if_veb.c
@@ -253,11 +253,6 @@ struct veb_softc {
unsigned int sc_pvlans_gen;
};
-#define DPRINTF(_sc, fmt...) do { \
- if (ISSET((_sc)->sc_if.if_flags, IFF_DEBUG)) \
- printf(fmt); \
-} while (0)
-
static int veb_clone_create(struct if_clone *, int);
static int veb_clone_destroy(struct ifnet *);
remove unused DPRINTF macros