Kill __FUNCTION__.

1 files changed, 48 insertions, 48 deletions

diff --git a/sys/dev/usb/if_url.c b/sys/dev/usb/if_url.c
index 560e2bbe862..74697ce6697 100644
--- a/sys/dev/usb/if_url.c
+++ b/sys/dev/usb/if_url.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_url.c,v 1.4 2002/05/09 16:13:31 nate Exp $ */
+/*	$OpenBSD: if_url.c,v 1.5 2002/06/26 11:29:55 espie Exp $ */
 /*	$NetBSD: if_url.c,v 1.2 2002/03/28 21:49:19 ichiro Exp $	*/
 /*
  * Copyright (c) 2001, 2002
@@ -347,7 +347,7 @@ USB_DETACH(url)
 	struct ifnet *ifp = GET_IFP(sc);
 	int s;
 
-	DPRINTF(("%s: %s: enter\n", USBDEVNAME(sc->sc_dev), __FUNCTION__));
+	DPRINTF(("%s: %s: enter\n", USBDEVNAME(sc->sc_dev), __func__));
 
 	/* Detached before attached finished */
 	if (!sc->sc_attached)
@@ -410,7 +410,7 @@ url_mem(struct url_softc *sc, int cmd, int offset, void *buf, int len)
 		return (0);
 
 	DPRINTFN(0x200,
-		("%s: %s: enter\n", USBDEVNAME(sc->sc_dev), __FUNCTION__));
+		("%s: %s: enter\n", USBDEVNAME(sc->sc_dev), __func__));
 
 	if (sc->sc_dying)
 		return (0);
@@ -445,7 +445,7 @@ url_csr_read_1(struct url_softc *sc, int reg)
 	u_int8_t val = 0;
 
 	DPRINTFN(0x100,
-		 ("%s: %s: enter\n", USBDEVNAME(sc->sc_dev), __FUNCTION__));
+		 ("%s: %s: enter\n", USBDEVNAME(sc->sc_dev), __func__));
 
 	if (sc->sc_dying)
 		return (0);
@@ -460,7 +460,7 @@ url_csr_read_2(struct url_softc *sc, int reg)
 	uWord val;
 
 	DPRINTFN(0x100,
-		 ("%s: %s: enter\n", USBDEVNAME(sc->sc_dev), __FUNCTION__));
+		 ("%s: %s: enter\n", USBDEVNAME(sc->sc_dev), __func__));
 
 	if (sc->sc_dying)
 		return (0);
@@ -476,7 +476,7 @@ url_csr_write_1(struct url_softc *sc, int reg, int aval)
 	u_int8_t val = aval;
 
 	DPRINTFN(0x100,
-		 ("%s: %s: enter\n", USBDEVNAME(sc->sc_dev), __FUNCTION__));
+		 ("%s: %s: enter\n", USBDEVNAME(sc->sc_dev), __func__));
 
 	if (sc->sc_dying)
 		return (0);
@@ -491,7 +491,7 @@ url_csr_write_2(struct url_softc *sc, int reg, int aval)
 	uWord val;
 
 	DPRINTFN(0x100,
-		 ("%s: %s: enter\n", USBDEVNAME(sc->sc_dev), __FUNCTION__));
+		 ("%s: %s: enter\n", USBDEVNAME(sc->sc_dev), __func__));
 
 	USETW(val, aval);
 
@@ -508,7 +508,7 @@ url_csr_write_4(struct url_softc *sc, int reg, int aval)
 	uDWord val;
 
 	DPRINTFN(0x100,
-		 ("%s: %s: enter\n", USBDEVNAME(sc->sc_dev), __FUNCTION__));
+		 ("%s: %s: enter\n", USBDEVNAME(sc->sc_dev), __func__));
 
 	USETDW(val, aval);
 
@@ -526,7 +526,7 @@ url_init(struct ifnet *ifp)
 	u_char *eaddr;
 	int i, s;
 
-	DPRINTF(("%s: %s: enter\n", USBDEVNAME(sc->sc_dev), __FUNCTION__));
+	DPRINTF(("%s: %s: enter\n", USBDEVNAME(sc->sc_dev), __func__));
 	
 	if (sc->sc_dying)
 		return (EIO);
@@ -608,7 +608,7 @@ url_reset(struct url_softc *sc)
 {
 	int i;
 	
-	DPRINTF(("%s: %s: enter\n", USBDEVNAME(sc->sc_dev), __FUNCTION__));
+	DPRINTF(("%s: %s: enter\n", USBDEVNAME(sc->sc_dev), __func__));
 
 	if (sc->sc_dying)
 		return;
@@ -630,7 +630,7 @@ url_activate(device_ptr_t self, enum devact act)
 	struct url_softc *sc = (struct url_softc *)self;
 
 	DPRINTF(("%s: %s: enter, act=%d\n", USBDEVNAME(sc->sc_dev),
-		 __FUNCTION__, act));
+		 __func__, act));
 
 	switch (act) {
 	case DVACT_ACTIVATE:
@@ -659,7 +659,7 @@ url_setmulti(struct url_softc *sc)
 	int h = 0;
 	int mcnt = 0;
 
-	DPRINTF(("%s: %s: enter\n", USBDEVNAME(sc->sc_dev), __FUNCTION__));
+	DPRINTF(("%s: %s: enter\n", USBDEVNAME(sc->sc_dev), __func__));
 
 	if (sc->sc_dying)
 		return;
@@ -768,7 +768,7 @@ url_openpipes(struct url_softc *sc)
 				USBD_NO_TIMEOUT, url_rxeof);
 		(void)usbd_transfer(c->url_xfer);
 		DPRINTF(("%s: %s: start read\n", USBDEVNAME(sc->sc_dev),
-			 __FUNCTION__));
+			 __func__));
 	}
 
  done:
@@ -783,7 +783,7 @@ url_newbuf(struct url_softc *sc, struct url_chain *c, struct mbuf *m)
 {
 	struct mbuf *m_new = NULL;
 
-	DPRINTF(("%s: %s: enter\n", USBDEVNAME(sc->sc_dev), __FUNCTION__));
+	DPRINTF(("%s: %s: enter\n", USBDEVNAME(sc->sc_dev), __func__));
 
 	if (m == NULL) {
 		MGETHDR(m_new, M_DONTWAIT, MT_DATA);
@@ -820,7 +820,7 @@ url_rx_list_init(struct url_softc *sc)
 	struct url_chain *c;
 	int i;
 
-	DPRINTF(("%s: %s: enter\n", USBDEVNAME(sc->sc_dev), __FUNCTION__));
+	DPRINTF(("%s: %s: enter\n", USBDEVNAME(sc->sc_dev), __func__));
 
 	cd = &sc->sc_cdata;
 	for (i = 0; i < URL_RX_LIST_CNT; i++) {
@@ -851,7 +851,7 @@ url_tx_list_init(struct url_softc *sc)
 	struct url_chain *c;
 	int i;
 
-	DPRINTF(("%s: %s: enter\n", USBDEVNAME(sc->sc_dev), __FUNCTION__));
+	DPRINTF(("%s: %s: enter\n", USBDEVNAME(sc->sc_dev), __func__));
 
 	cd = &sc->sc_cdata;
 	for (i = 0; i < URL_TX_LIST_CNT; i++) {
@@ -881,7 +881,7 @@ url_start(struct ifnet *ifp)
 	struct mbuf *m_head = NULL;
 	
 	DPRINTF(("%s: %s: enter, link=%d\n", USBDEVNAME(sc->sc_dev),
-		 __FUNCTION__, sc->sc_link));
+		 __func__, sc->sc_link));
 
 	if (sc->sc_dying)
 		return;
@@ -921,7 +921,7 @@ url_send(struct url_softc *sc, struct mbuf *m, int idx)
 	struct url_chain *c;
 	usbd_status err;
 
-	DPRINTF(("%s: %s: enter\n", USBDEVNAME(sc->sc_dev),__FUNCTION__));
+	DPRINTF(("%s: %s: enter\n", USBDEVNAME(sc->sc_dev),__func__));
 
 	c = &sc->sc_cdata.url_tx_chain[idx];
 
@@ -950,7 +950,7 @@ url_send(struct url_softc *sc, struct mbuf *m, int idx)
 	}
 
 	DPRINTF(("%s: %s: send %d bytes\n", USBDEVNAME(sc->sc_dev),
-		 __FUNCTION__, total_len));
+		 __func__, total_len));
 
 	sc->sc_cdata.url_tx_cnt++;
 
@@ -970,7 +970,7 @@ url_txeof(usbd_xfer_handle xfer, usbd_private_handle priv, usbd_status status)
 
 	s = splnet();
 
-	DPRINTF(("%s: %s: enter\n", USBDEVNAME(sc->sc_dev), __FUNCTION__));
+	DPRINTF(("%s: %s: enter\n", USBDEVNAME(sc->sc_dev), __func__));
 
 	ifp->if_timer = 0;
 	ifp->if_flags &= ~IFF_OACTIVE;
@@ -1015,7 +1015,7 @@ url_rxeof(usbd_xfer_handle xfer, usbd_private_handle priv, usbd_status status)
 	url_rxhdr_t rxhdr;
 	int s;
 
-	DPRINTF(("%s: %s: enter\n", USBDEVNAME(sc->sc_dev),__FUNCTION__));
+	DPRINTF(("%s: %s: enter\n", USBDEVNAME(sc->sc_dev),__func__));
 
 	if (sc->sc_dying)
 		return;
@@ -1083,7 +1083,7 @@ url_rxeof(usbd_xfer_handle xfer, usbd_private_handle priv, usbd_status status)
 #endif
 
 	DPRINTF(("%s: %s: deliver %d\n", USBDEVNAME(sc->sc_dev),
-		 __FUNCTION__, m->m_len));
+		 __func__, m->m_len));
 	IF_INPUT(ifp, m);
 
  done1:
@@ -1099,7 +1099,7 @@ url_rxeof(usbd_xfer_handle xfer, usbd_private_handle priv, usbd_status status)
 	if (--sc->sc_refcnt < 0)
 		usb_detach_wakeup(USBDEV(sc->sc_dev));
 
-	DPRINTF(("%s: %s: start rx\n", USBDEVNAME(sc->sc_dev), __FUNCTION__));
+	DPRINTF(("%s: %s: start rx\n", USBDEVNAME(sc->sc_dev), __func__));
 }
 
 #if 0
@@ -1117,7 +1117,7 @@ url_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data)
 	struct mii_data *mii;
 	int s, error = 0;
 
-	DPRINTF(("%s: %s: enter\n", USBDEVNAME(sc->sc_dev), __FUNCTION__));
+	DPRINTF(("%s: %s: enter\n", USBDEVNAME(sc->sc_dev), __func__));
 
 	if (sc->sc_dying)
 		return (EIO);
@@ -1212,7 +1212,7 @@ url_watchdog(struct ifnet *ifp)
 	usbd_status stat;
 	int s;
 	
-	DPRINTF(("%s: %s: enter\n", USBDEVNAME(sc->sc_dev), __FUNCTION__));
+	DPRINTF(("%s: %s: enter\n", USBDEVNAME(sc->sc_dev), __func__));
 
 	ifp->if_oerrors++;
 	printf("%s: watchdog timeout\n", USBDEVNAME(sc->sc_dev));
@@ -1241,7 +1241,7 @@ url_stop(struct ifnet *ifp, int disable)
 	usbd_status err;
 	int i;
 	
-	DPRINTF(("%s: %s: enter\n", USBDEVNAME(sc->sc_dev), __FUNCTION__));
+	DPRINTF(("%s: %s: enter\n", USBDEVNAME(sc->sc_dev), __func__));
 
 	ifp->if_timer = 0;
 
@@ -1327,7 +1327,7 @@ url_ifmedia_change(struct ifnet *ifp)
 	struct url_softc *sc = ifp->if_softc;
 	struct mii_data *mii = GET_MII(sc);
 
-	DPRINTF(("%s: %s: enter\n", USBDEVNAME(sc->sc_dev), __FUNCTION__));
+	DPRINTF(("%s: %s: enter\n", USBDEVNAME(sc->sc_dev), __func__));
 
 	if (sc->sc_dying)
 		return (0);
@@ -1350,7 +1350,7 @@ url_ifmedia_status(struct ifnet *ifp, struct ifmediareq *ifmr)
 	struct url_softc *sc = ifp->if_softc;
 	struct mii_data *mii = GET_MII(sc);
 
-	DPRINTF(("%s: %s: enter\n", USBDEVNAME(sc->sc_dev), __FUNCTION__));
+	DPRINTF(("%s: %s: enter\n", USBDEVNAME(sc->sc_dev), __func__));
 
 	if (sc->sc_dying)
 		return;
@@ -1375,7 +1375,7 @@ url_tick(void *xsc)
 		return;
 
 	DPRINTFN(0xff, ("%s: %s: enter\n", USBDEVNAME(sc->sc_dev),
-			__FUNCTION__));
+			__func__));
 
 	if (sc->sc_dying)
 		return;
@@ -1396,7 +1396,7 @@ url_tick_task(void *xsc)
 		return;
 
 	DPRINTFN(0xff, ("%s: %s: enter\n", USBDEVNAME(sc->sc_dev),
-			__FUNCTION__));
+			__func__));
 
 	if (sc->sc_dying)
 		return;
@@ -1415,7 +1415,7 @@ url_tick_task(void *xsc)
 		if (mii->mii_media_status & IFM_ACTIVE &&
 		    IFM_SUBTYPE(mii->mii_media_active) != IFM_NONE) {
 			DPRINTF(("%s: %s: got link\n",
-				 USBDEVNAME(sc->sc_dev), __FUNCTION__));
+				 USBDEVNAME(sc->sc_dev), __func__));
 			sc->sc_link++;
 			if (IFQ_IS_EMPTY(&ifp->if_snd) == 0)
 				   url_start(ifp);
@@ -1432,7 +1432,7 @@ Static void
 url_lock_mii(struct url_softc *sc)
 {
 	DPRINTFN(0xff, ("%s: %s: enter\n", USBDEVNAME(sc->sc_dev),
-			__FUNCTION__));
+			__func__));
 
 	sc->sc_refcnt++;
 	usb_lockmgr(&sc->sc_mii_lock, LK_EXCLUSIVE, NULL, curproc);
@@ -1442,7 +1442,7 @@ Static void
 url_unlock_mii(struct url_softc *sc)
 {
 	DPRINTFN(0xff, ("%s: %s: enter\n", USBDEVNAME(sc->sc_dev),
-		       __FUNCTION__));
+		       __func__));
 
 	usb_lockmgr(&sc->sc_mii_lock, LK_RELEASE, NULL, curproc);
 	if (--sc->sc_refcnt < 0)
@@ -1461,12 +1461,12 @@ url_int_miibus_readreg(device_ptr_t dev, int phy, int reg)
 	sc = USBGETSOFTC(dev);
 
 	DPRINTFN(0xff, ("%s: %s: enter, phy=%d reg=0x%04x\n",
-		 USBDEVNAME(sc->sc_dev), __FUNCTION__, phy, reg));
+		 USBDEVNAME(sc->sc_dev), __func__, phy, reg));
 
 	if (sc->sc_dying) {
 #ifdef DIAGNOSTIC
 		printf("%s: %s: dying\n", USBDEVNAME(sc->sc_dev),
-		       __FUNCTION__);
+		       __func__);
 #endif
 		return (0);
 	}
@@ -1474,7 +1474,7 @@ url_int_miibus_readreg(device_ptr_t dev, int phy, int reg)
 	/* XXX: one PHY only for the RTL8150 internal PHY */
 	if (phy != 0) {
 		DPRINTFN(0xff, ("%s: %s: phy=%d is not supported\n",
-			 USBDEVNAME(sc->sc_dev), __FUNCTION__, phy));
+			 USBDEVNAME(sc->sc_dev), __func__, phy));
 		return (0);
 	}
 
@@ -1503,7 +1503,7 @@ url_int_miibus_readreg(device_ptr_t dev, int phy, int reg)
 		break;
 	default:
 		printf("%s: %s: bad register %04x\n",
-		       USBDEVNAME(sc->sc_dev), __FUNCTION__, reg);
+		       USBDEVNAME(sc->sc_dev), __func__, reg);
 		val = 0;
 		goto R_DONE;
 		break;
@@ -1516,7 +1516,7 @@ url_int_miibus_readreg(device_ptr_t dev, int phy, int reg)
 
  R_DONE:
 	DPRINTFN(0xff, ("%s: %s: phy=%d reg=0x%04x => 0x%04x\n",
-		 USBDEVNAME(sc->sc_dev), __FUNCTION__, phy, reg, val));
+		 USBDEVNAME(sc->sc_dev), __func__, phy, reg, val));
 
 	url_unlock_mii(sc);
 	return (val);
@@ -1533,12 +1533,12 @@ url_int_miibus_writereg(device_ptr_t dev, int phy, int reg, int data)
 	sc = USBGETSOFTC(dev);
 
 	DPRINTFN(0xff, ("%s: %s: enter, phy=%d reg=0x%04x data=0x%04x\n",
-		 USBDEVNAME(sc->sc_dev), __FUNCTION__, phy, reg, data));
+		 USBDEVNAME(sc->sc_dev), __func__, phy, reg, data));
 
 	if (sc->sc_dying) {
 #ifdef DIAGNOSTIC
 		printf("%s: %s: dying\n", USBDEVNAME(sc->sc_dev),
-		       __FUNCTION__);
+		       __func__);
 #endif
 		return;
 	}
@@ -1546,7 +1546,7 @@ url_int_miibus_writereg(device_ptr_t dev, int phy, int reg, int data)
 	/* XXX: one PHY only for the RTL8150 internal PHY */
 	if (phy != 0) {
 		DPRINTFN(0xff, ("%s: %s: phy=%d is not supported\n",
-			 USBDEVNAME(sc->sc_dev), __FUNCTION__, phy));
+			 USBDEVNAME(sc->sc_dev), __func__, phy));
 		return;
 	}
 
@@ -1574,7 +1574,7 @@ url_int_miibus_writereg(device_ptr_t dev, int phy, int reg, int data)
 		break;
 	default:
 		printf("%s: %s: bad register %04x\n",
-		       USBDEVNAME(sc->sc_dev), __FUNCTION__, reg);
+		       USBDEVNAME(sc->sc_dev), __func__, reg);
 		goto W_DONE;
 		break;
 	}
@@ -1599,7 +1599,7 @@ url_miibus_statchg(device_ptr_t dev)
 		return;
 
 	sc = USBGETSOFTC(dev);
-	DPRINTF(("%s: %s: enter\n", USBDEVNAME(sc->sc_dev), __FUNCTION__));
+	DPRINTF(("%s: %s: enter\n", USBDEVNAME(sc->sc_dev), __func__));
 #endif
 	/* Nothing to do */
 }
@@ -1615,12 +1615,12 @@ url_ext_miibus_redreg(device_ptr_t dev, int phy, int reg)
 	u_int16_t val;
 
 	DPRINTF(("%s: %s: enter, phy=%d reg=0x%04x\n",
-		 USBDEVNAME(sc->sc_dev), __FUNCTION__, phy, reg));
+		 USBDEVNAME(sc->sc_dev), __func__, phy, reg));
 
 	if (sc->sc_dying) {
 #ifdef DIAGNOSTIC
 		printf("%s: %s: dying\n", USBDEVNAME(sc->sc_dev),
-		       __FUNCTION__);
+		       __func__);
 #endif
 		return (0);
 	}
@@ -1646,7 +1646,7 @@ url_ext_miibus_redreg(device_ptr_t dev, int phy, int reg)
 	val = url_csr_read_2(sc, URL_PHYDAT);
 
 	DPRINTF(("%s: %s: phy=%d reg=0x%04x => 0x%04x\n",
-		 USBDEVNAME(sc->sc_dev), __FUNCTION__, phy, reg, val));
+		 USBDEVNAME(sc->sc_dev), __func__, phy, reg, val));
 
 	url_unlock_mii(sc);
 	return (val);
@@ -1658,12 +1658,12 @@ url_ext_miibus_writereg(device_ptr_t dev, int phy, int reg, int data)
 	struct url_softc *sc = USBGETSOFTC(dev);
 
 	DPRINTF(("%s: %s: enter, phy=%d reg=0x%04x data=0x%04x\n",
-		 USBDEVNAME(sc->sc_dev), __FUNCTION__, phy, reg, data));
+		 USBDEVNAME(sc->sc_dev), __func__, phy, reg, data));
 
 	if (sc->sc_dying) {
 #ifdef DIAGNOSTIC
 		printf("%s: %s: dying\n", USBDEVNAME(sc->sc_dev),
-		       __FUNCTION__);
+		       __func__);
 #endif
 		return;
 	}