summaryrefslogtreecommitdiffstats
path: root/sys/dev/fb
diff options
context:
space:
mode:
authorobrien <obrien@FreeBSD.org>2001-12-10 08:09:49 +0000
committerobrien <obrien@FreeBSD.org>2001-12-10 08:09:49 +0000
commit7fd9a6a23abf2fb25b5925b444d0eed93c8d06f6 (patch)
treeb580d740769b3b201f76ad941e8b0b8ca3015bc0 /sys/dev/fb
parent957a76ab241ec60b1b21124054416935dba9688b (diff)
downloadFreeBSD-src-7fd9a6a23abf2fb25b5925b444d0eed93c8d06f6.zip
FreeBSD-src-7fd9a6a23abf2fb25b5925b444d0eed93c8d06f6.tar.gz
Update to C99, s/__FUNCTION__/__func__/,
also don't use ANSI string concatenation.
Diffstat (limited to 'sys/dev/fb')
-rw-r--r--sys/dev/fb/s3_pci.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/sys/dev/fb/s3_pci.c b/sys/dev/fb/s3_pci.c
index 20c8b0a..c7a1be8 100644
--- a/sys/dev/fb/s3_pci.c
+++ b/sys/dev/fb/s3_pci.c
@@ -471,7 +471,7 @@ s3pci_attach(device_t dev)
int rid, i;
if (s3pci_dev) {
- printf("%s: driver already attached!\n", __FUNCTION__);
+ printf("%s: driver already attached!\n", __func__);
goto error;
}
@@ -480,7 +480,7 @@ s3pci_attach(device_t dev)
rid = 0;
if (!(sc->port_res = bus_alloc_resource(dev, SYS_RES_IOPORT, &rid,
0ul, ~0ul, 0, RF_ACTIVE | RF_SHAREABLE))) {
- printf("%s: port resource allocation failed!\n", __FUNCTION__);
+ printf("%s: port resource allocation failed!\n", __func__);
goto error;
}
sc->st = rman_get_bustag(sc->port_res);
@@ -490,7 +490,7 @@ s3pci_attach(device_t dev)
if (!(sc->enh_res = bus_alloc_resource(dev, SYS_RES_IOPORT, &rid,
0ul, ~0ul, 0, RF_ACTIVE | RF_SHAREABLE))) {
printf("%s: enhanced port resource allocation failed!\n",
- __FUNCTION__);
+ __func__);
goto error;
}
sc->enh_st = rman_get_bustag(sc->enh_res);
@@ -500,7 +500,7 @@ s3pci_attach(device_t dev)
if (!(sc->mem_res = bus_alloc_resource(dev, SYS_RES_MEMORY, &rid,
0, ~0, 1, RF_ACTIVE))) {
- printf("%s: mem resource allocation failed!\n", __FUNCTION__);
+ printf("%s: mem resource allocation failed!\n", __func__);
goto error;
}
@@ -522,7 +522,7 @@ s3pci_attach(device_t dev)
*/
if ((adp == NULL) || !(adp->va_flags & V_ADP_VESA)) {
printf("%s: VGA adapter not found or VESA module not loaded!\n",
- __FUNCTION__);
+ __func__);
goto error;
}
OpenPOWER on IntegriCloud