CVS commit: src/sys/dev/mvme

[Izumi Tsutsui]

Module Name:    src
Committed By:   tsutsui
Date:           Sun Jun  5 16:22:00 UTC 2011

Modified Files:
        src/sys/dev/mvme: if_ie_mvme.c

Log Message:
Umm, fix more split fallout.
While here use a common arg name (aux) as mentioned in autoconf(9).


To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/sys/dev/mvme/if_ie_mvme.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: src/sys/dev/mvme/if_ie_mvme.c
diff -u src/sys/dev/mvme/if_ie_mvme.c:1.18 src/sys/dev/mvme/if_ie_mvme.c:1.19
--- src/sys/dev/mvme/if_ie_mvme.c:1.18	Sun Jun  5 16:08:20 2011
+++ src/sys/dev/mvme/if_ie_mvme.c	Sun Jun  5 16:22:00 2011
@@ -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 <sys/cdefs.h>
-__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 <sys/param.h>
 #include <sys/systm.h>
@@ -68,7 +68,7 @@
 	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 @@
 
 /* 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 @@
 
 /* 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 @@
 	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 @@
 
 	/* 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,