Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't use __func__ as variable. It prevents compilation.

Browse Source 
Use __FUNCTION__ instead.
This commit is contained in:
enami 2001-11-21 09:08:38 +00:00
parent 1029005107
commit eca8404326
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
sys/dev/cardbus/cardbus.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: cardbus.c,v 1.38 2001/11/15 09:48:02 lukem Exp $ */ /* $NetBSD: cardbus.c,v 1.39 2001/11/21 09:08:38 enami Exp $ */
/* /*
* Copyright (c) 1997, 1998, 1999 and 2000 * Copyright (c) 1997, 1998, 1999 and 2000
@ -33,7 +33,7 @@
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: cardbus.c,v 1.38 2001/11/15 09:48:02 lukem Exp $"); __KERNEL_RCSID(0, "$NetBSD: cardbus.c,v 1.39 2001/11/21 09:08:38 enami Exp $");
#include "opt_cardbus.h" #include "opt_cardbus.h"
@ -287,9 +287,6 @@ cardbus_read_tuples(struct cardbus_attach_args *ca, cardbusreg_t cis_ptr,
static void static void
parse_tuple(u_int8_t *tuple, int len, void *data) parse_tuple(u_int8_t *tuple, int len, void *data)
{ {
#ifdef CARDBUS_DEBUG
static const char __func__[] = "parse_tuple";
#endif
struct cardbus_cis_info *cis = data; struct cardbus_cis_info *cis = data;
char *p; char *p;
int i, bar_index; int i, bar_index;
@ -298,7 +295,7 @@ parse_tuple(u_int8_t *tuple, int len, void *data)
case PCMCIA_CISTPL_MANFID: case PCMCIA_CISTPL_MANFID:
if (tuple[1] != 5) { if (tuple[1] != 5) {
DPRINTF(("%s: wrong length manufacturer id (%d)\n", DPRINTF(("%s: wrong length manufacturer id (%d)\n",
__func__, tuple[1])); __FUNCTION__, tuple[1]));
break; break;
} }
cis->manufacturer = tuple[2] | (tuple[3] << 8); cis->manufacturer = tuple[2] | (tuple[3] << 8);
@ -323,12 +320,13 @@ parse_tuple(u_int8_t *tuple, int len, void *data)
case PCMCIA_CISTPL_BAR: case PCMCIA_CISTPL_BAR:
if (tuple[1] != 6) { if (tuple[1] != 6) {
DPRINTF(("%s: BAR with short length (%d)\n", DPRINTF(("%s: BAR with short length (%d)\n",
__func__, tuple[1])); __FUNCTION__, tuple[1]));
break; break;
} }
bar_index = tuple[2] & 7; bar_index = tuple[2] & 7;
if (bar_index == 0) { if (bar_index == 0) {
DPRINTF(("%s: invalid ASI in BAR tuple\n", __func__)); DPRINTF(("%s: invalid ASI in BAR tuple\n",
__FUNCTION__));
break; break;
} }
bar_index--; bar_index--;
@ -362,7 +360,7 @@ parse_tuple(u_int8_t *tuple, int len, void *data)
sizeof(cis->funce.network.netid)) { sizeof(cis->funce.network.netid)) {
DPRINTF(("%s: unknown network id type " DPRINTF(("%s: unknown network id type "
"(len = %d)\n", "(len = %d)\n",
__func__, tuple[3])); __FUNCTION__, tuple[3]));
} else { } else {
cis->funce.network.netid_present = 1; cis->funce.network.netid_present = 1;
memcpy(cis->funce.network.netid, memcpy(cis->funce.network.netid,