Update to C99, s/__FUNCTION__/__func__/,

also don't use ANSI string concatenation.

3 files changed, 12 insertions, 12 deletions

diff --git a/sys/dev/ppbus/ppb_1284.c b/sys/dev/ppbus/ppb_1284.c
index 0915828..3fdd11b 100644
--- a/sys/dev/ppbus/ppb_1284.c
+++ b/sys/dev/ppbus/ppb_1284.c
@@ -173,7 +173,7 @@ ppb_request_mode(int mode, int options)
 			request_mode = EPP_1284_NORMAL;
 			break;
 		default:
-			panic("%s: unsupported mode %d\n", __FUNCTION__, mode);
+			panic("%s: unsupported mode %d\n", __func__, mode);
 		}
 	}
 
@@ -607,7 +607,7 @@ ppb_1284_read_id(device_t bus, int mode, char *buffer,
 		error = spp_1284_read(bus, PPB_BYTE, buffer, max, read);
 		break;
 	default:
-		panic("%s: unsupported mode %d\n", __FUNCTION__, mode);
+		panic("%s: unsupported mode %d\n", __func__, mode);
 	}
 
 	ppb_1284_terminate(bus);
@@ -790,7 +790,7 @@ ppb_1284_negociate(device_t bus, int mode, int options)
 		break;
 
 	default:
-		panic("%s: unknown mode (%d)!", __FUNCTION__, mode);
+		panic("%s: unknown mode (%d)!", __func__, mode);
 	}
 	ppb_set_mode(bus, mode);
 
diff --git a/sys/dev/ppbus/ppb_msq.c b/sys/dev/ppbus/ppb_msq.c
index 6cd99a0..9c83451 100644
--- a/sys/dev/ppbus/ppb_msq.c
+++ b/sys/dev/ppbus/ppb_msq.c
@@ -66,7 +66,7 @@ mode2xfer(device_t bus, struct ppb_device *ppbdev, int opcode)
 		break;
 
 	default:
-		panic("%s: unknown opcode (%d)", __FUNCTION__, opcode);
+		panic("%s: unknown opcode (%d)", __func__, opcode);
 	}
 
 	/* retrieve the device operating mode */
@@ -89,7 +89,7 @@ mode2xfer(device_t bus, struct ppb_device *ppbdev, int opcode)
 			index = EPP19_MSQ;
 			break;
 		default:
-			panic("%s: unknown EPP protocol (0x%x)!", __FUNCTION__,
+			panic("%s: unknown EPP protocol (0x%x)!", __func__,
 				epp);
 		}
 		break;
@@ -97,7 +97,7 @@ mode2xfer(device_t bus, struct ppb_device *ppbdev, int opcode)
 		index = ECP_MSQ;
 		break;
 	default:
-		panic("%s: unknown mode (%d)", __FUNCTION__, ppbdev->mode);
+		panic("%s: unknown mode (%d)", __func__, ppbdev->mode);
 	}
 
 	return (&table[index]);
@@ -204,11 +204,11 @@ ppb_MS_init_msq(struct ppb_microseq *msq, int nbparam, ...)
 		/* check the instruction position */
 		if (arg >= PPB_MS_MAXARGS)
 			panic("%s: parameter out of range (0x%x)!",
-				__FUNCTION__, param);
+				__func__, param);
 
 #if 0
 		printf("%s: param = %d, ins = %d, arg = %d, type = %d\n", 
-			__FUNCTION__, param, ins, arg, type);
+			__func__, param, ins, arg, type);
 #endif
 
 		/* properly cast the parameter */
@@ -230,7 +230,7 @@ ppb_MS_init_msq(struct ppb_microseq *msq, int nbparam, ...)
 			break;
 
 		default:
-			panic("%s: unknown parameter (0x%x)!", __FUNCTION__,
+			panic("%s: unknown parameter (0x%x)!", __func__,
 				param);
 		}
 	}
@@ -288,7 +288,7 @@ ppb_MS_microseq(device_t bus, device_t dev, struct ppb_microseq *msq, int *ret)
 					INCR_PC;
 					goto next;
 				} else
-					panic("%s: IEEE1284 read not supported", __FUNCTION__);
+					panic("%s: IEEE1284 read not supported", __func__);
 			}
 
 			/* XXX should use ppb_MS_init_msq() */
diff --git a/sys/dev/ppbus/vpoio.c b/sys/dev/ppbus/vpoio.c
index 7ce6f08..059bd2e 100644
--- a/sys/dev/ppbus/vpoio.c
+++ b/sys/dev/ppbus/vpoio.c
@@ -297,7 +297,7 @@ vpoio_connect(struct vpoio_data *vpo, int how)
 	if ((error = ppb_request_bus(ppbus, vpo->vpo_dev, how))) {
 
 #ifdef VP0_DEBUG
-		printf("%s: can't request bus!\n", __FUNCTION__);
+		printf("%s: can't request bus!\n", __func__);
 #endif
 		return error;
 	}
@@ -652,7 +652,7 @@ vpoio_reset_bus(struct vpoio_data *vpo)
 	if (vpoio_connect(vpo, PPB_WAIT|PPB_INTR) || !vpoio_in_disk_mode(vpo)) {
 
 #ifdef VP0_DEBUG
-		printf("%s: not in disk mode!\n", __FUNCTION__);
+		printf("%s: not in disk mode!\n", __func__);
 #endif
 		/* release ppbus */
 		vpoio_disconnect(vpo);