summaryrefslogtreecommitdiff
path: root/sys/dev/mca
diff options
context:
space:
mode:
authorthorpej <thorpej@NetBSD.org>2006-03-29 06:51:47 +0000
committerthorpej <thorpej@NetBSD.org>2006-03-29 06:51:47 +0000
commit838ee1e0d90129e856db3a99e09d4bb40c541b6d (patch)
treeda9d09ba9c553a626341fe8ab4c8efdb86242ec4 /sys/dev/mca
parent8fc35725733521389e5dd87c986097a7c24e0de8 (diff)
Use device_private().
Diffstat (limited to 'sys/dev/mca')
-rw-r--r--sys/dev/mca/aha_mca.c6
-rw-r--r--sys/dev/mca/com_mca.c6
-rw-r--r--sys/dev/mca/ed_mca.c8
-rw-r--r--sys/dev/mca/edc_mca.c6
-rw-r--r--sys/dev/mca/esp_mca.c6
-rw-r--r--sys/dev/mca/if_ate_mca.c6
-rw-r--r--sys/dev/mca/if_elmc_mca.c6
-rw-r--r--sys/dev/mca/if_ep_mca.c6
-rw-r--r--sys/dev/mca/if_le_mca.c6
-rw-r--r--sys/dev/mca/if_ne_mca.c6
-rw-r--r--sys/dev/mca/if_tr_mca.c6
-rw-r--r--sys/dev/mca/if_tra_mca.c6
-rw-r--r--sys/dev/mca/if_we_mca.c6
13 files changed, 40 insertions, 40 deletions
diff --git a/sys/dev/mca/aha_mca.c b/sys/dev/mca/aha_mca.c
index a8653606992..17ffb947ac0 100644
--- a/sys/dev/mca/aha_mca.c
+++ b/sys/dev/mca/aha_mca.c
@@ -1,4 +1,4 @@
-/* $NetBSD: aha_mca.c,v 1.13 2005/12/11 12:22:18 christos Exp $ */
+/* $NetBSD: aha_mca.c,v 1.14 2006/03/29 06:58:14 thorpej Exp $ */
/*
* Copyright (c) 2000-2002 The NetBSD Foundation, Inc.
@@ -52,7 +52,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: aha_mca.c,v 1.13 2005/12/11 12:22:18 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: aha_mca.c,v 1.14 2006/03/29 06:58:14 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -104,7 +104,7 @@ aha_mca_attach(parent, self, aux)
void *aux;
{
struct mca_attach_args *ma = aux;
- struct aha_softc *sc = (void *)self;
+ struct aha_softc *sc = device_private(self);
bus_space_tag_t iot = ma->ma_iot;
bus_space_handle_t ioh;
struct aha_probe_data apd;
diff --git a/sys/dev/mca/com_mca.c b/sys/dev/mca/com_mca.c
index b22aed09aa5..ffe7217b7cd 100644
--- a/sys/dev/mca/com_mca.c
+++ b/sys/dev/mca/com_mca.c
@@ -1,4 +1,4 @@
-/* $NetBSD: com_mca.c,v 1.13 2005/12/11 12:22:18 christos Exp $ */
+/* $NetBSD: com_mca.c,v 1.14 2006/03/29 06:58:14 thorpej Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -72,7 +72,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: com_mca.c,v 1.13 2005/12/11 12:22:18 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: com_mca.c,v 1.14 2006/03/29 06:58:14 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -162,7 +162,7 @@ com_mca_attach(parent, self, aux)
struct device *parent, *self;
void *aux;
{
- struct com_mca_softc *isc = (void *)self;
+ struct com_mca_softc *isc = device_private(self);
struct com_softc *sc = &isc->sc_com;
int iobase, irq;
struct mca_attach_args *ma = aux;
diff --git a/sys/dev/mca/ed_mca.c b/sys/dev/mca/ed_mca.c
index 09c943a201d..597f5273a0d 100644
--- a/sys/dev/mca/ed_mca.c
+++ b/sys/dev/mca/ed_mca.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ed_mca.c,v 1.31 2005/12/11 12:22:18 christos Exp $ */
+/* $NetBSD: ed_mca.c,v 1.32 2006/03/29 06:58:14 thorpej Exp $ */
/*
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ed_mca.c,v 1.31 2005/12/11 12:22:18 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ed_mca.c,v 1.32 2006/03/29 06:58:14 thorpej Exp $");
#include "rnd.h"
@@ -145,8 +145,8 @@ ed_mca_attach(parent, self, aux)
struct device *parent, *self;
void *aux;
{
- struct ed_softc *ed = (void *) self;
- struct edc_mca_softc *sc = (void *) parent;
+ struct ed_softc *ed = device_private(self);
+ struct edc_mca_softc *sc = device_private(parent);
struct ed_attach_args *eda = (struct ed_attach_args *) aux;
char pbuf[8];
int drv_flags;
diff --git a/sys/dev/mca/edc_mca.c b/sys/dev/mca/edc_mca.c
index 684f887b970..34262f55820 100644
--- a/sys/dev/mca/edc_mca.c
+++ b/sys/dev/mca/edc_mca.c
@@ -1,4 +1,4 @@
-/* $NetBSD: edc_mca.c,v 1.32 2005/12/11 12:22:18 christos Exp $ */
+/* $NetBSD: edc_mca.c,v 1.33 2006/03/29 06:58:14 thorpej Exp $ */
/*
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -50,7 +50,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: edc_mca.c,v 1.32 2005/12/11 12:22:18 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: edc_mca.c,v 1.33 2006/03/29 06:58:14 thorpej Exp $");
#include "rnd.h"
@@ -156,7 +156,7 @@ edc_mca_attach(parent, self, aux)
struct device *parent, *self;
void *aux;
{
- struct edc_mca_softc *sc = (void *) self;
+ struct edc_mca_softc *sc = device_private(self);
struct mca_attach_args *ma = aux;
struct ed_attach_args eda;
int pos2, pos3, pos4;
diff --git a/sys/dev/mca/esp_mca.c b/sys/dev/mca/esp_mca.c
index 12fff02e446..7424e81a653 100644
--- a/sys/dev/mca/esp_mca.c
+++ b/sys/dev/mca/esp_mca.c
@@ -1,4 +1,4 @@
-/* $NetBSD: esp_mca.c,v 1.11 2006/03/08 23:46:27 lukem Exp $ */
+/* $NetBSD: esp_mca.c,v 1.12 2006/03/29 06:58:14 thorpej Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -45,7 +45,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: esp_mca.c,v 1.11 2006/03/08 23:46:27 lukem Exp $");
+__KERNEL_RCSID(0, "$NetBSD: esp_mca.c,v 1.12 2006/03/29 06:58:14 thorpej Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -148,7 +148,7 @@ esp_mca_attach(parent, self, aux)
void *aux;
{
struct mca_attach_args *ma = aux;
- struct esp_softc *esc = (void *)self;
+ struct esp_softc *esc = device_private(self);
struct ncr53c9x_softc *sc = &esc->sc_ncr53c9x;
u_int16_t iobase;
int scsi_id, irq, drq, error;
diff --git a/sys/dev/mca/if_ate_mca.c b/sys/dev/mca/if_ate_mca.c
index 02660d9855f..345a8f8e430 100644
--- a/sys/dev/mca/if_ate_mca.c
+++ b/sys/dev/mca/if_ate_mca.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ate_mca.c,v 1.13 2005/12/11 12:22:18 christos Exp $ */
+/* $NetBSD: if_ate_mca.c,v 1.14 2006/03/29 06:58:14 thorpej Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ate_mca.c,v 1.13 2005/12/11 12:22:18 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ate_mca.c,v 1.14 2006/03/29 06:58:14 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -133,7 +133,7 @@ ate_mca_attach(parent, self, aux)
struct device *parent, *self;
void *aux;
{
- struct ate_softc *isc = (struct ate_softc *)self;
+ struct ate_softc *isc = device_private(self);
struct mb86960_softc *sc = &isc->sc_mb86960;
struct mca_attach_args *ma = aux;
bus_space_tag_t iot = ma->ma_iot;
diff --git a/sys/dev/mca/if_elmc_mca.c b/sys/dev/mca/if_elmc_mca.c
index ed1b86854c6..649ab725263 100644
--- a/sys/dev/mca/if_elmc_mca.c
+++ b/sys/dev/mca/if_elmc_mca.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_elmc_mca.c,v 1.19 2005/12/11 12:22:18 christos Exp $ */
+/* $NetBSD: if_elmc_mca.c,v 1.20 2006/03/29 06:58:14 thorpej Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -46,7 +46,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_elmc_mca.c,v 1.19 2005/12/11 12:22:18 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_elmc_mca.c,v 1.20 2006/03/29 06:58:14 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -107,7 +107,7 @@ elmc_mca_match(struct device *parent, struct cfdata *cf, void *aux)
void
elmc_mca_attach(struct device *parent, struct device *self, void *aux)
{
- struct elmc_mca_softc *asc = (void *) self;
+ struct elmc_mca_softc *asc = device_private(self);
struct ie_softc *sc = &asc->sc_ie;
struct mca_attach_args *ma = aux;
int pos2, pos3, i, revision;
diff --git a/sys/dev/mca/if_ep_mca.c b/sys/dev/mca/if_ep_mca.c
index 3aa92ccba26..dd594aa212a 100644
--- a/sys/dev/mca/if_ep_mca.c
+++ b/sys/dev/mca/if_ep_mca.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ep_mca.c,v 1.14 2005/12/11 12:22:18 christos Exp $ */
+/* $NetBSD: if_ep_mca.c,v 1.15 2006/03/29 06:58:14 thorpej Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -76,7 +76,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ep_mca.c,v 1.14 2005/12/11 12:22:18 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ep_mca.c,v 1.15 2006/03/29 06:58:14 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -160,7 +160,7 @@ ep_mca_attach(parent, self, aux)
struct device *parent, *self;
void *aux;
{
- struct ep_softc *sc = (void *)self;
+ struct ep_softc *sc = device_private(self);
struct mca_attach_args *ma = aux;
bus_space_handle_t ioh;
int pos4, pos5, iobase, irq, media;
diff --git a/sys/dev/mca/if_le_mca.c b/sys/dev/mca/if_le_mca.c
index 042d3073266..e35800a5d27 100644
--- a/sys/dev/mca/if_le_mca.c
+++ b/sys/dev/mca/if_le_mca.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_le_mca.c,v 1.12 2005/12/24 20:27:42 perry Exp $ */
+/* $NetBSD: if_le_mca.c,v 1.13 2006/03/29 06:58:14 thorpej Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -52,7 +52,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_le_mca.c,v 1.12 2005/12/24 20:27:42 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_le_mca.c,v 1.13 2006/03/29 06:58:14 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -137,7 +137,7 @@ le_mca_match(struct device *parent, struct cfdata *cf, void *aux)
void
le_mca_attach(struct device *parent, struct device *self, void *aux)
{
- struct le_mca_softc *lesc = (struct le_mca_softc *) self;
+ struct le_mca_softc *lesc = device_private(self);
struct lance_softc *sc = &lesc->sc_am7990.lsc;
struct mca_attach_args *ma = aux;
int i, pos2, pos3, pos4, irq, membase, supmedia=0;
diff --git a/sys/dev/mca/if_ne_mca.c b/sys/dev/mca/if_ne_mca.c
index afc1f271bbc..c94218ca744 100644
--- a/sys/dev/mca/if_ne_mca.c
+++ b/sys/dev/mca/if_ne_mca.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ne_mca.c,v 1.9 2005/12/11 12:22:18 christos Exp $ */
+/* $NetBSD: if_ne_mca.c,v 1.10 2006/03/29 06:58:14 thorpej Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -45,7 +45,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ne_mca.c,v 1.9 2005/12/11 12:22:18 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ne_mca.c,v 1.10 2006/03/29 06:58:14 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -135,7 +135,7 @@ static const int ne_mca_iobase[] = {
void
ne_mca_attach(struct device *parent, struct device *self, void *aux)
{
- struct ne_mca_softc *psc = (struct ne_mca_softc *)self;
+ struct ne_mca_softc *psc = device_private(self);
struct ne2000_softc *nsc = &psc->sc_ne2000;
struct dp8390_softc *dsc = &nsc->sc_dp8390;
struct mca_attach_args *ma = aux;
diff --git a/sys/dev/mca/if_tr_mca.c b/sys/dev/mca/if_tr_mca.c
index bf0a9196822..15d7c1c23b6 100644
--- a/sys/dev/mca/if_tr_mca.c
+++ b/sys/dev/mca/if_tr_mca.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_tr_mca.c,v 1.13 2005/12/11 12:22:18 christos Exp $ */
+/* $NetBSD: if_tr_mca.c,v 1.14 2006/03/29 06:58:14 thorpej Exp $ */
/*_
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_tr_mca.c,v 1.13 2005/12/11 12:22:18 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_tr_mca.c,v 1.14 2006/03/29 06:58:14 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -117,7 +117,7 @@ tr_mca_attach(parent, self, aux)
struct device *parent, *self;
void *aux;
{
- struct tr_softc *sc = (void *) self;
+ struct tr_softc *sc = device_private(self);
struct mca_attach_args *ma = aux;
bus_space_handle_t pioh, mmioh, sramh;
int iobase, irq, sram_size, sram_addr, rom_addr;
diff --git a/sys/dev/mca/if_tra_mca.c b/sys/dev/mca/if_tra_mca.c
index 16c50f27ee2..6973eeb7e1a 100644
--- a/sys/dev/mca/if_tra_mca.c
+++ b/sys/dev/mca/if_tra_mca.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_tra_mca.c,v 1.3 2005/12/11 12:22:18 christos Exp $ */
+/* $NetBSD: if_tra_mca.c,v 1.4 2006/03/29 06:58:14 thorpej Exp $ */
/*-
* Copyright (c) 2004 The NetBSD Foundation, Inc.
@@ -42,7 +42,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_tra_mca.c,v 1.3 2005/12/11 12:22:18 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_tra_mca.c,v 1.4 2006/03/29 06:58:14 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -134,7 +134,7 @@ tiara_mca_attach(parent, self, aux)
struct device *parent, *self;
void *aux;
{
- struct tiara_softc *isc = (struct tiara_softc *)self;
+ struct tiara_softc *isc = device_private(self);
struct mb86950_softc *sc = &isc->sc_mb86950;
struct mca_attach_args *ma = aux;
bus_space_tag_t iot = ma->ma_iot;
diff --git a/sys/dev/mca/if_we_mca.c b/sys/dev/mca/if_we_mca.c
index 77b61762ae1..ad70704ed31 100644
--- a/sys/dev/mca/if_we_mca.c
+++ b/sys/dev/mca/if_we_mca.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_we_mca.c,v 1.14 2005/12/11 12:22:18 christos Exp $ */
+/* $NetBSD: if_we_mca.c,v 1.15 2006/03/29 06:58:14 thorpej Exp $ */
/*-
* Copyright (c) 1997, 1998, 2001 The NetBSD Foundation, Inc.
@@ -60,7 +60,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_we_mca.c,v 1.14 2005/12/11 12:22:18 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_we_mca.c,v 1.15 2006/03/29 06:58:14 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -160,7 +160,7 @@ we_mca_attach(parent, self, aux)
struct device *parent, *self;
void *aux;
{
- struct we_softc *wsc = (struct we_softc *)self;
+ struct we_softc *wsc = device_private(self);
struct dp8390_softc *sc = &wsc->sc_dp8390;
struct mca_attach_args *ma = aux;
const struct we_mca_product *wep;