diff options
| author | Federico G. Schwindt <fgsch@cvs.openbsd.org> | 2005-09-13 18:53:02 +0000 |
|---|---|---|
| committer | Federico G. Schwindt <fgsch@cvs.openbsd.org> | 2005-09-13 18:53:02 +0000 |
| commit | 6117dda4ad302e6bb544c409d75148b3ae58187a (patch) | |
| tree | b959ebac7f1ed6faed80fb3c44e6ce7647861657 /sys/dev | |
| parent | 620f89b005d1a46be2ef666fdc71756367c6a5b1 (diff) | |
some missing cleanup from the previous commit.
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/cardbus/cardbus.c | 17 | ||||
| -rw-r--r-- | sys/dev/cardbus/rbus.c | 8 |
2 files changed, 11 insertions, 14 deletions
diff --git a/sys/dev/cardbus/cardbus.c b/sys/dev/cardbus/cardbus.c index ed8b27b9a5b..879fa4fd257 100644 --- a/sys/dev/cardbus/cardbus.c +++ b/sys/dev/cardbus/cardbus.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cardbus.c,v 1.29 2005/09/13 18:44:38 fgsch Exp $ */ +/* $OpenBSD: cardbus.c,v 1.30 2005/09/13 18:53:01 fgsch Exp $ */ /* $NetBSD: cardbus.c,v 1.24 2000/04/02 19:11:37 mycroft Exp $ */ /* @@ -282,9 +282,6 @@ cardbus_read_tuples(struct cardbus_attach_args *ca, cardbusreg_t cis_ptr, static void 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; int bar_index; int i; @@ -294,7 +291,7 @@ parse_tuple(u_int8_t *tuple, int len, void *data) case PCMCIA_CISTPL_MANFID: if (tuple[1] < 4) { DPRINTF(("%s: wrong length manufacturer id (%d)\n", - func, tuple[1])); + __func__, tuple[1])); break; } cis->manufacturer = tuple[2] | (tuple[3] << 8); @@ -317,13 +314,14 @@ parse_tuple(u_int8_t *tuple, int len, void *data) break; case PCMCIA_CISTPL_BAR: if (tuple[1] != 6) { - DPRINTF(("%s: BAR with short length (%d)\n", func, - tuple[1])); + DPRINTF(("%s: BAR with short length (%d)\n", + __func__, tuple[1])); break; } bar_index = tuple[2] & 7; if (bar_index == 0) { - DPRINTF(("%s: invalid ASI in BAR tuple\n", func)); + DPRINTF(("%s: invalid ASI in BAR tuple\n", + __func__)); break; } bar_index--; @@ -351,7 +349,8 @@ parse_tuple(u_int8_t *tuple, int len, void *data) if (tuple[3] > sizeof(cis->funce.network.netid)) { DPRINTF(("%s: unknown network id type" - " (len = %d)\n", func, tuple[3])); + " (len = %d)\n", __func__, + tuple[3])); } else { cis->funce.network.netid_present = 1; bcopy(tuple + 4, diff --git a/sys/dev/cardbus/rbus.c b/sys/dev/cardbus/rbus.c index b12f8fd9f7b..43be6229c05 100644 --- a/sys/dev/cardbus/rbus.c +++ b/sys/dev/cardbus/rbus.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rbus.c,v 1.9 2005/09/13 18:44:38 fgsch Exp $ */ +/* $OpenBSD: rbus.c,v 1.10 2005/09/13 18:53:01 fgsch Exp $ */ /* $NetBSD: rbus.c,v 1.3 1999/11/06 06:20:53 soren Exp $ */ /* * Copyright (c) 1999 @@ -52,10 +52,8 @@ #endif -static rbus_tag_t rbus_new_body(bus_space_tag_t bt, rbus_tag_t parent, - struct extent *ex, bus_addr_t start, - bus_addr_t end, bus_addr_t offset, - int flags); +static rbus_tag_t rbus_new_body(bus_space_tag_t, rbus_tag_t, struct extent *, + bus_addr_t, bus_addr_t, bus_addr_t, int); int rbus_space_alloc(rbus_tag_t rbt, bus_addr_t addr, bus_size_t size, |