From e8604b1e0224b8c2c77b66e8e7e11abba0bcebde Mon Sep 17 00:00:00 2001 From: tsutsui Date: Sun, 5 Jun 2011 16:22:00 +0000 Subject: [PATCH] Umm, fix more split fallout. While here use a common arg name (aux) as mentioned in autoconf(9). --- sys/dev/mvme/if_ie_mvme.c | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/sys/dev/mvme/if_ie_mvme.c b/sys/dev/mvme/if_ie_mvme.c index 0aa50cad64c6..8b1c14368c76 100644 --- a/sys/dev/mvme/if_ie_mvme.c +++ b/sys/dev/mvme/if_ie_mvme.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_ie_mvme.c,v 1.18 2011/06/05 16:08:20 christos Exp $ */ +/* $NetBSD: if_ie_mvme.c,v 1.19 2011/06/05 16:22:00 tsutsui Exp $ */ /*- * Copyright (c) 1999, 2002 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: if_ie_mvme.c,v 1.18 2011/06/05 16:08:20 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_ie_mvme.c,v 1.19 2011/06/05 16:22:00 tsutsui Exp $"); #include #include @@ -68,7 +68,7 @@ struct ie_pcctwo_softc { struct evcnt ps_evcnt; }; -CFATTACH_DECL(ie_pcctwo, sizeof(struct ie_pcctwo_softc), +CFATTACH_DECL_NEW(ie_pcctwo, sizeof(struct ie_pcctwo_softc), ie_pcctwo_match, ie_pcctwo_attach, NULL, NULL); extern struct cfdriver ie_cd; @@ -218,11 +218,11 @@ ie_write_24(struct ie_softc *sc, int offset, int addr) /* ARGSUSED */ int -ie_pcctwo_match(device_t parent, cfdata_t cf, void *args) +ie_pcctwo_match(device_t parent, cfdata_t cf, void *aux) { struct pcctwo_attach_args *pa; - pa = args; + pa = aux; if (strcmp(pa->pa_name, ie_cd.cd_name)) return (0); @@ -234,7 +234,7 @@ ie_pcctwo_match(device_t parent, cfdata_t cf, void *args) /* ARGSUSED */ void -ie_pcctwo_attach(device_t parent, device_t self, void *args) +ie_pcctwo_attach(device_t parent, device_t self, void *aux) { struct pcctwo_attach_args *pa; struct ie_pcctwo_softc *ps; @@ -242,9 +242,10 @@ ie_pcctwo_attach(device_t parent, device_t self, void *args) bus_dma_segment_t seg; int rseg; - pa = (struct pcctwo_attach_args *) args; + pa = aux; ps = device_private(self); - sc = device_private(self); + sc = &ps->ps_ie; + sc->sc_dev = self; /* Map the MPU controller registers in PCCTWO space */ ps->ps_bust = pa->pa_bust; @@ -308,7 +309,7 @@ ie_pcctwo_attach(device_t parent, device_t self, void *args) /* Register the event counter */ evcnt_attach_dynamic(&ps->ps_evcnt, EVCNT_TYPE_INTR, - pcctwointr_evcnt(pa->pa_ipl), "ether", device_xname(sc->sc_dev)); + pcctwointr_evcnt(pa->pa_ipl), "ether", device_xname(self)); /* Finally, hook the hardware interrupt */ pcctwointr_establish(PCCTWOV_LANC_IRQ, i82586_intr, pa->pa_ipl, sc,