Update to C99, s/__FUNCTION__/__func__/,

also don't use ANSI string concatenation.

1 files changed, 12 insertions, 12 deletions

diff --git a/sys/dev/ichsmb/ichsmb.c b/sys/dev/ichsmb/ichsmb.c
index c17f09a..c310546 100644
--- a/sys/dev/ichsmb/ichsmb.c
+++ b/sys/dev/ichsmb/ichsmb.c
@@ -71,7 +71,7 @@
 #define ICHSMB_DEBUG	0
 #if ICHSMB_DEBUG != 0 && defined(__GNUC__)
 #define DBG(fmt, args...)	\
-	do { log(LOG_DEBUG, "%s: " fmt, __FUNCTION__ , ## args); } while (0)
+	do { log(LOG_DEBUG, "%s: " fmt, __func__ , ## args); } while (0)
 #else
 #define DBG(fmt, args...)	do { } while (0)
 #endif
@@ -164,7 +164,7 @@ ichsmb_quick(device_t dev, u_char slave, int how)
 
 	DBG("slave=0x%02x how=%d\n", slave, how);
 	KASSERT(sc->ich_cmd == -1,
-	    ("%s: ich_cmd=%d\n", __FUNCTION__ , sc->ich_cmd));
+	    ("%s: ich_cmd=%d\n", __func__ , sc->ich_cmd));
 	switch (how) {
 	case SMB_QREAD:
 	case SMB_QWRITE:
@@ -193,7 +193,7 @@ ichsmb_sendb(device_t dev, u_char slave, char byte)
 
 	DBG("slave=0x%02x byte=0x%02x\n", slave, (u_char)byte);
 	KASSERT(sc->ich_cmd == -1,
-	    ("%s: ich_cmd=%d\n", __FUNCTION__ , sc->ich_cmd));
+	    ("%s: ich_cmd=%d\n", __func__ , sc->ich_cmd));
 	mtx_lock(&sc->mutex);
 	sc->ich_cmd = ICH_HST_CNT_SMB_CMD_BYTE;
 	bus_space_write_1(sc->io_bst, sc->io_bsh, ICH_XMIT_SLVA,
@@ -215,7 +215,7 @@ ichsmb_recvb(device_t dev, u_char slave, char *byte)
 
 	DBG("slave=0x%02x\n", slave);
 	KASSERT(sc->ich_cmd == -1,
-	    ("%s: ich_cmd=%d\n", __FUNCTION__ , sc->ich_cmd));
+	    ("%s: ich_cmd=%d\n", __func__ , sc->ich_cmd));
 	mtx_lock(&sc->mutex);
 	sc->ich_cmd = ICH_HST_CNT_SMB_CMD_BYTE;
 	bus_space_write_1(sc->io_bst, sc->io_bsh, ICH_XMIT_SLVA,
@@ -238,7 +238,7 @@ ichsmb_writeb(device_t dev, u_char slave, char cmd, char byte)
 	DBG("slave=0x%02x cmd=0x%02x byte=0x%02x\n",
 	    slave, (u_char)cmd, (u_char)byte);
 	KASSERT(sc->ich_cmd == -1,
-	    ("%s: ich_cmd=%d\n", __FUNCTION__ , sc->ich_cmd));
+	    ("%s: ich_cmd=%d\n", __func__ , sc->ich_cmd));
 	mtx_lock(&sc->mutex);
 	sc->ich_cmd = ICH_HST_CNT_SMB_CMD_BYTE_DATA;
 	bus_space_write_1(sc->io_bst, sc->io_bsh, ICH_XMIT_SLVA,
@@ -262,7 +262,7 @@ ichsmb_writew(device_t dev, u_char slave, char cmd, short word)
 	DBG("slave=0x%02x cmd=0x%02x word=0x%04x\n",
 	    slave, (u_char)cmd, (u_int16_t)word);
 	KASSERT(sc->ich_cmd == -1,
-	    ("%s: ich_cmd=%d\n", __FUNCTION__ , sc->ich_cmd));
+	    ("%s: ich_cmd=%d\n", __func__ , sc->ich_cmd));
 	mtx_lock(&sc->mutex);
 	sc->ich_cmd = ICH_HST_CNT_SMB_CMD_WORD_DATA;
 	bus_space_write_1(sc->io_bst, sc->io_bsh, ICH_XMIT_SLVA,
@@ -286,7 +286,7 @@ ichsmb_readb(device_t dev, u_char slave, char cmd, char *byte)
 
 	DBG("slave=0x%02x cmd=0x%02x\n", slave, (u_char)cmd);
 	KASSERT(sc->ich_cmd == -1,
-	    ("%s: ich_cmd=%d\n", __FUNCTION__ , sc->ich_cmd));
+	    ("%s: ich_cmd=%d\n", __func__ , sc->ich_cmd));
 	mtx_lock(&sc->mutex);
 	sc->ich_cmd = ICH_HST_CNT_SMB_CMD_BYTE_DATA;
 	bus_space_write_1(sc->io_bst, sc->io_bsh, ICH_XMIT_SLVA,
@@ -309,7 +309,7 @@ ichsmb_readw(device_t dev, u_char slave, char cmd, short *word)
 
 	DBG("slave=0x%02x cmd=0x%02x\n", slave, (u_char)cmd);
 	KASSERT(sc->ich_cmd == -1,
-	    ("%s: ich_cmd=%d\n", __FUNCTION__ , sc->ich_cmd));
+	    ("%s: ich_cmd=%d\n", __func__ , sc->ich_cmd));
 	mtx_lock(&sc->mutex);
 	sc->ich_cmd = ICH_HST_CNT_SMB_CMD_WORD_DATA;
 	bus_space_write_1(sc->io_bst, sc->io_bsh, ICH_XMIT_SLVA,
@@ -337,7 +337,7 @@ ichsmb_pcall(device_t dev, u_char slave, char cmd, short sdata, short *rdata)
 	DBG("slave=0x%02x cmd=0x%02x sdata=0x%04x\n",
 	    slave, (u_char)cmd, (u_int16_t)sdata);
 	KASSERT(sc->ich_cmd == -1,
-	    ("%s: ich_cmd=%d\n", __FUNCTION__ , sc->ich_cmd));
+	    ("%s: ich_cmd=%d\n", __func__ , sc->ich_cmd));
 	mtx_lock(&sc->mutex);
 	sc->ich_cmd = ICH_HST_CNT_SMB_CMD_PROC_CALL;
 	bus_space_write_1(sc->io_bst, sc->io_bsh, ICH_XMIT_SLVA,
@@ -381,7 +381,7 @@ ichsmb_bwrite(device_t dev, u_char slave, char cmd, u_char count, char *buf)
 #undef DISP
 #endif
 	KASSERT(sc->ich_cmd == -1,
-	    ("%s: ich_cmd=%d\n", __FUNCTION__ , sc->ich_cmd));
+	    ("%s: ich_cmd=%d\n", __func__ , sc->ich_cmd));
 	if (count < 1 || count > 32)
 		return (EINVAL);
 	bcopy(buf, sc->block_data, count);
@@ -412,7 +412,7 @@ ichsmb_bread(device_t dev, u_char slave, char cmd, u_char count, char *buf)
 
 	DBG("slave=0x%02x cmd=0x%02x count=%d\n", slave, (u_char)cmd, count);
 	KASSERT(sc->ich_cmd == -1,
-	    ("%s: ich_cmd=%d\n", __FUNCTION__ , sc->ich_cmd));
+	    ("%s: ich_cmd=%d\n", __func__ , sc->ich_cmd));
 	if (count < 1 || count > 32)
 		return (EINVAL);
 	bzero(sc->block_data, sizeof(sc->block_data));
@@ -625,7 +625,7 @@ ichsmb_wait(sc_p sc)
 	int error, smb_error;
 
 	KASSERT(sc->ich_cmd != -1,
-	    ("%s: ich_cmd=%d\n", __FUNCTION__ , sc->ich_cmd));
+	    ("%s: ich_cmd=%d\n", __func__ , sc->ich_cmd));
 	mtx_assert(&sc->mutex, MA_OWNED);
 sleep:
 	error = msleep(sc, &sc->mutex, PZERO | PCATCH, "ichsmb", hz / 4);