summaryrefslogtreecommitdiff
path: root/sys/dev/pcmcia
diff options
context:
space:
mode:
authorGilles Chehade <gilles@cvs.openbsd.org>2007-09-11 13:39:35 +0000
committerGilles Chehade <gilles@cvs.openbsd.org>2007-09-11 13:39:35 +0000
commitca08fa30b3ab02619e3cdee1f4ffd7fae6833fd1 (patch)
tree51e8b8caf8623fba8a3acc9ce731036f9376a41c /sys/dev/pcmcia
parent023f148f597a0a1455b3cd62cf30553f5dbc28b5 (diff)
KNF
prompted and "much better" by marco@, ok pyr@
Diffstat (limited to 'sys/dev/pcmcia')
-rw-r--r--sys/dev/pcmcia/cfxga.c4
-rw-r--r--sys/dev/pcmcia/if_xe.c4
-rw-r--r--sys/dev/pcmcia/pcmcia.c4
-rw-r--r--sys/dev/pcmcia/pcmcia_cis.c6
4 files changed, 9 insertions, 9 deletions
diff --git a/sys/dev/pcmcia/cfxga.c b/sys/dev/pcmcia/cfxga.c
index 4fab88cad89..2132820295a 100644
--- a/sys/dev/pcmcia/cfxga.c
+++ b/sys/dev/pcmcia/cfxga.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cfxga.c,v 1.15 2007/09/09 01:00:35 fgsch Exp $ */
+/* $OpenBSD: cfxga.c,v 1.16 2007/09/11 13:39:33 gilles Exp $ */
/*
* Copyright (c) 2005, 2006, Matthieu Herrb and Miodrag Vallat
@@ -223,7 +223,7 @@ cfxga_install_function(struct pcmcia_function *pf)
/* Create a simple cfe. */
cfe = (struct pcmcia_config_entry *)malloc(sizeof *cfe,
- M_DEVBUF, M_NOWAIT|M_ZERO);
+ M_DEVBUF, M_NOWAIT | M_ZERO);
if (cfe == NULL) {
DPRINTF(("%s: cfe allocation failed\n", __func__));
return (ENOMEM);
diff --git a/sys/dev/pcmcia/if_xe.c b/sys/dev/pcmcia/if_xe.c
index bc8527e5615..108be3d3a27 100644
--- a/sys/dev/pcmcia/if_xe.c
+++ b/sys/dev/pcmcia/if_xe.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_xe.c,v 1.34 2007/09/07 18:21:40 fgsch Exp $ */
+/* $OpenBSD: if_xe.c,v 1.35 2007/09/11 13:39:33 gilles Exp $ */
/*
* Copyright (c) 1999 Niklas Hallqvist, Brandon Creighton, Job de Haas
@@ -249,7 +249,7 @@ xe_pcmcia_attach(parent, self, aux)
/* Fake a cfe. */
SIMPLEQ_FIRST(&pa->pf->cfe_head) = cfe = (struct pcmcia_config_entry *)
- malloc(sizeof *cfe, M_DEVBUF, M_NOWAIT|M_ZERO);
+ malloc(sizeof *cfe, M_DEVBUF, M_NOWAIT | M_ZERO);
if (!cfe) {
printf(": function enable failed\n");
return;
diff --git a/sys/dev/pcmcia/pcmcia.c b/sys/dev/pcmcia/pcmcia.c
index 4b91b32271f..6659f0538c7 100644
--- a/sys/dev/pcmcia/pcmcia.c
+++ b/sys/dev/pcmcia/pcmcia.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pcmcia.c,v 1.38 2007/09/07 18:21:40 fgsch Exp $ */
+/* $OpenBSD: pcmcia.c,v 1.39 2007/09/11 13:39:34 gilles Exp $ */
/* $NetBSD: pcmcia.c,v 1.9 1998/08/13 02:10:55 eeh Exp $ */
/*
@@ -200,7 +200,7 @@ pcmcia_card_attach(dev)
* want to probe. Fixup a function element for it.
*/
if (SIMPLEQ_FIRST(&sc->card.pf_head) == NULL) {
- pf = malloc(sizeof *pf, M_DEVBUF, M_NOWAIT|M_ZERO);
+ pf = malloc(sizeof *pf, M_DEVBUF, M_NOWAIT | M_ZERO);
if (pf == NULL)
panic("pcmcia_card_attach");
pf->number = 0;
diff --git a/sys/dev/pcmcia/pcmcia_cis.c b/sys/dev/pcmcia/pcmcia_cis.c
index 52dba7ab474..e3db1547070 100644
--- a/sys/dev/pcmcia/pcmcia_cis.c
+++ b/sys/dev/pcmcia/pcmcia_cis.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pcmcia_cis.c,v 1.14 2007/09/07 18:21:40 fgsch Exp $ */
+/* $OpenBSD: pcmcia_cis.c,v 1.15 2007/09/11 13:39:34 gilles Exp $ */
/* $NetBSD: pcmcia_cis.c,v 1.9 1998/08/22 23:41:48 msaitoh Exp $ */
/*
@@ -845,7 +845,7 @@ pcmcia_parse_cis_tuple(tuple, arg)
}
if (state->pf == NULL) {
state->pf = malloc(sizeof(*state->pf), M_DEVBUF,
- M_NOWAIT|M_ZERO);
+ M_NOWAIT | M_ZERO);
if (state->pf == NULL)
panic("pcmcia_parse_cis_tuple");
state->pf->number = state->count++;
@@ -885,7 +885,7 @@ pcmcia_parse_cis_tuple(tuple, arg)
}
if (state->pf == NULL) {
state->pf = malloc(sizeof(*state->pf),
- M_DEVBUF, M_NOWAIT|M_ZERO);
+ M_DEVBUF, M_NOWAIT | M_ZERO);
if (state->pf == NULL)
panic("pcmcia_parse_cis_tuple");
state->pf->number = state->count++;