diff options
author | obrien <obrien@FreeBSD.org> | 2001-12-10 08:09:49 +0000 |
---|---|---|
committer | obrien <obrien@FreeBSD.org> | 2001-12-10 08:09:49 +0000 |
commit | 7fd9a6a23abf2fb25b5925b444d0eed93c8d06f6 (patch) | |
tree | b580d740769b3b201f76ad941e8b0b8ca3015bc0 /sys/pci | |
parent | 957a76ab241ec60b1b21124054416935dba9688b (diff) | |
download | FreeBSD-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/pci')
-rw-r--r-- | sys/pci/agp_intel.c | 8 | ||||
-rw-r--r-- | sys/pci/alpm.c | 2 | ||||
-rw-r--r-- | sys/pci/amdpm.c | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/sys/pci/agp_intel.c b/sys/pci/agp_intel.c index 532fa07..bb5338a 100644 --- a/sys/pci/agp_intel.c +++ b/sys/pci/agp_intel.c @@ -216,7 +216,7 @@ agp_intel_detach(device_t dev) case 0x1a218086: /* i840 */ case 0x25308086: /* i850 */ case 0x25318086: /* i860 */ - printf("%s: set MCHCFG to %x\n", __FUNCTION__, (unsigned) + printf("%s: set MCHCFG to %x\n", __func__, (unsigned) (pci_read_config(dev, AGP_INTEL_MCHCFG, 2) & ~(1 << 9))); pci_write_config(dev, AGP_INTEL_MCHCFG, @@ -224,7 +224,7 @@ agp_intel_detach(device_t dev) & ~(1 << 9)), 2); case 0x25008086: /* i820 */ - printf("%s: set RDCR to %x\n", __FUNCTION__, (unsigned) + printf("%s: set RDCR to %x\n", __func__, (unsigned) (pci_read_config(dev, AGP_INTEL_I820_RDCR, 1) & ~(1 << 1))); pci_write_config(dev, AGP_INTEL_I820_RDCR, @@ -232,7 +232,7 @@ agp_intel_detach(device_t dev) & ~(1 << 1)), 1); case 0x1a308086: /* i845 */ - printf("%s: set MCHCFG to %x\n", __FUNCTION__, (unsigned) + printf("%s: set MCHCFG to %x\n", __func__, (unsigned) (pci_read_config(dev, AGP_INTEL_I845_MCHCFG, 1) & ~(1 << 1))); pci_write_config(dev, AGP_INTEL_MCHCFG, @@ -240,7 +240,7 @@ agp_intel_detach(device_t dev) & ~(1 << 1)), 1); default: /* Intel Generic (maybe) */ - printf("%s: set NBXCFG to %x\n", __FUNCTION__, + printf("%s: set NBXCFG to %x\n", __func__, (pci_read_config(dev, AGP_INTEL_NBXCFG, 4) & ~(1 << 9))); pci_write_config(dev, AGP_INTEL_NBXCFG, diff --git a/sys/pci/alpm.c b/sys/pci/alpm.c index ecf272c..a99f5f2 100644 --- a/sys/pci/alpm.c +++ b/sys/pci/alpm.c @@ -441,7 +441,7 @@ alsmb_smb_quick(device_t dev, u_char slave, int how) ALPM_SMBOUTB(sc, SMBHADDR, slave | LSB); break; default: - panic("%s: unknown QUICK command (%x)!", __FUNCTION__, + panic("%s: unknown QUICK command (%x)!", __func__, how); } ALPM_SMBOUTB(sc, SMBCMD, SMBQUICK); diff --git a/sys/pci/amdpm.c b/sys/pci/amdpm.c index 8667bb4..be81223 100644 --- a/sys/pci/amdpm.c +++ b/sys/pci/amdpm.c @@ -343,7 +343,7 @@ amdsmb_smb_quick(device_t dev, u_char slave, int how) AMDPM_SMBOUTW(sc, AMDSMB_HSTADDR, slave | LSB); break; default: - panic("%s: unknown QUICK command (%x)!", __FUNCTION__, how); + panic("%s: unknown QUICK command (%x)!", __func__, how); } l = AMDPM_SMBINW(sc, AMDSMB_GLOBAL_ENABLE); AMDPM_SMBOUTW(sc, AMDSMB_GLOBAL_ENABLE, (l & 0xfff8) | AMDSMB_GE_CYC_QUICK | AMDSMB_GE_HOST_STC); |