Update to C99, s/__FUNCTION__/__func__/,

also don't use ANSI string concatenation.

4 files changed, 8 insertions, 8 deletions

diff --git a/sys/dev/iicbus/if_ic.c b/sys/dev/iicbus/if_ic.c
index fa8ffdf..2db1841 100644
--- a/sys/dev/iicbus/if_ic.c
+++ b/sys/dev/iicbus/if_ic.c
@@ -351,7 +351,7 @@ icintr (device_t dev, int event, char *ptr)
 		break;
 
 	default:
-		panic("%s: unknown event (%d)!", __FUNCTION__, event);
+		panic("%s: unknown event (%d)!", __func__, event);
 	}
 
 	splx(s);
diff --git a/sys/dev/iicbus/iic.c b/sys/dev/iicbus/iic.c
index 42c3ee0..a8d731e 100644
--- a/sys/dev/iicbus/iic.c
+++ b/sys/dev/iicbus/iic.c
@@ -162,7 +162,7 @@ iicclose(dev_t dev, int flags, int fmt, struct thread *td)
 	sc->sc_count--;
 
 	if (sc->sc_count < 0)
-		panic("%s: iic_count < 0!", __FUNCTION__);
+		panic("%s: iic_count < 0!", __func__);
 
 	return (0);
 }
@@ -219,7 +219,7 @@ iicread(dev_t dev, struct uio * uio, int ioflag)
 		return (error);
 
 	if (bufsize > uio->uio_resid)
-		panic("%s: too much data read!", __FUNCTION__);
+		panic("%s: too much data read!", __func__);
 
 	iicbus_release_bus(device_get_parent(iicdev), iicdev);
 
diff --git a/sys/dev/iicbus/iicbus.c b/sys/dev/iicbus/iicbus.c
index 4d4a671..1a20543 100644
--- a/sys/dev/iicbus/iicbus.c
+++ b/sys/dev/iicbus/iicbus.c
@@ -198,7 +198,7 @@ iicbus_attach(device_t dev)
 			break;
 
 		default:
-			panic("%s: unknown class!", __FUNCTION__);
+			panic("%s: unknown class!", __func__);
 		}
 
 		if (iicdev->iicd_alive) {
@@ -249,7 +249,7 @@ iicbus_print_child(device_t bus, device_t dev)
 		break;
 
 	default:
-		panic("%s: unknown class!", __FUNCTION__);
+		panic("%s: unknown class!", __func__);
 	}
 
 	return (retval);
diff --git a/sys/dev/iicbus/iicsmb.c b/sys/dev/iicbus/iicsmb.c
index 680c8b6..a38845bdb 100644
--- a/sys/dev/iicbus/iicsmb.c
+++ b/sys/dev/iicbus/iicsmb.c
@@ -179,7 +179,7 @@ iicsmb_intr(device_t dev, int event, char *buf)
 		switch (sc->state) {
 		case SMB_DONE:
 			/* XXX too much data, discard */
-			printf("%s: too much data from 0x%x\n", __FUNCTION__,
+			printf("%s: too much data from 0x%x\n", __func__,
 				sc->devaddr & 0xff);
 			goto end;
 
@@ -212,14 +212,14 @@ end:
 			break;
 
 		default:
-			printf("%s unknown error 0x%x!\n", __FUNCTION__,
+			printf("%s unknown error 0x%x!\n", __func__,
 								(int)*buf);
 			break;
 		}
 		break;
 
 	default:
-		panic("%s: unknown event (%d)!", __FUNCTION__, event);
+		panic("%s: unknown event (%d)!", __func__, event);
 	}
 
 	return;