summaryrefslogtreecommitdiff
path: root/sys/arch
diff options
context:
space:
mode:
Diffstat (limited to 'sys/arch')
-rw-r--r--sys/arch/hp300/dev/mb89352.c10
-rw-r--r--sys/arch/luna88k/dev/mb89352.c10
-rw-r--r--sys/arch/mac68k/dev/esp.c11
-rw-r--r--sys/arch/mac68k/dev/ncr5380.c10
-rw-r--r--sys/arch/mac68k/dev/sbc.c11
-rw-r--r--sys/arch/mac68k/dev/sbc_obio.c3
-rw-r--r--sys/arch/mac68k/dev/sbcvar.h3
-rw-r--r--sys/arch/macppc/dev/esp.c8
-rw-r--r--sys/arch/macppc/dev/mesh.c7
-rw-r--r--sys/arch/mvme68k/dev/vs.c10
-rw-r--r--sys/arch/mvme68k/dev/vsbic.c10
-rw-r--r--sys/arch/mvme68k/dev/vsdma.c10
-rw-r--r--sys/arch/mvme68k/dev/wdsc.c10
-rw-r--r--sys/arch/mvme88k/dev/vs.c10
-rw-r--r--sys/arch/mvme88k/dev/vsbic.c10
-rw-r--r--sys/arch/sparc/dev/esp.c11
-rw-r--r--sys/arch/sparc/dev/si.c13
-rw-r--r--sys/arch/sparc64/dev/vdsk.c7
-rw-r--r--sys/arch/vax/dec/sii.c10
-rw-r--r--sys/arch/vax/vsa/asc_vsbus.c12
-rw-r--r--sys/arch/vax/vsa/ncr.c10
21 files changed, 25 insertions, 171 deletions
diff --git a/sys/arch/hp300/dev/mb89352.c b/sys/arch/hp300/dev/mb89352.c
index f738d175373..2ff642e9e5e 100644
--- a/sys/arch/hp300/dev/mb89352.c
+++ b/sys/arch/hp300/dev/mb89352.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mb89352.c,v 1.24 2010/06/26 23:24:43 guenther Exp $ */
+/* $OpenBSD: mb89352.c,v 1.25 2010/06/28 18:31:01 krw Exp $ */
/* $NetBSD: mb89352.c,v 1.5 2000/03/23 07:01:31 thorpej Exp $ */
/* NecBSD: mb89352.c,v 1.4 1998/03/14 07:31:20 kmatsuda Exp */
@@ -163,13 +163,6 @@ void spc_print_active_acb(void);
extern struct cfdriver spc_cd;
-struct scsi_device spc_dev = {
- NULL, /* Use default error handler */
- NULL, /* have a queue, served by this */
- NULL, /* have no async handler */
- NULL, /* Use default 'done' routine */
-};
-
struct scsi_adapter spc_switch = {
spc_scsi_cmd,
scsi_minphys,
@@ -213,7 +206,6 @@ spc_attach(struct spc_softc *sc)
sc->sc_link.adapter_softc = sc;
sc->sc_link.adapter_target = sc->sc_initiator;
sc->sc_link.adapter = &spc_switch;
- sc->sc_link.device = &spc_dev;
sc->sc_link.openings = 2;
bzero(&saa, sizeof(saa));
diff --git a/sys/arch/luna88k/dev/mb89352.c b/sys/arch/luna88k/dev/mb89352.c
index 49a7a98b9ba..cdf1e181d7a 100644
--- a/sys/arch/luna88k/dev/mb89352.c
+++ b/sys/arch/luna88k/dev/mb89352.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mb89352.c,v 1.14 2010/06/26 23:24:43 guenther Exp $ */
+/* $OpenBSD: mb89352.c,v 1.15 2010/06/28 18:31:01 krw Exp $ */
/* $NetBSD: mb89352.c,v 1.5 2000/03/23 07:01:31 thorpej Exp $ */
/* NecBSD: mb89352.c,v 1.4 1998/03/14 07:31:20 kmatsuda Exp */
@@ -176,13 +176,6 @@ void spc_print_active_acb(void);
extern struct cfdriver spc_cd;
-struct scsi_device spc_dev = {
- NULL, /* Use default error handler */
- NULL, /* have a queue, served by this */
- NULL, /* have no async handler */
- NULL, /* Use default 'done' routine */
-};
-
/*
* INITIALIZATION ROUTINES (probe, attach ++)
*/
@@ -221,7 +214,6 @@ spc_attach(sc, adapter)
sc->sc_link.adapter_softc = sc;
sc->sc_link.adapter_target = sc->sc_initiator;
sc->sc_link.adapter = adapter;
- sc->sc_link.device = &spc_dev;
sc->sc_link.openings = 2;
bzero(&saa, sizeof(saa));
diff --git a/sys/arch/mac68k/dev/esp.c b/sys/arch/mac68k/dev/esp.c
index 124d747e900..f38532e73cb 100644
--- a/sys/arch/mac68k/dev/esp.c
+++ b/sys/arch/mac68k/dev/esp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: esp.c,v 1.29 2010/06/26 23:24:43 guenther Exp $ */
+/* $OpenBSD: esp.c,v 1.30 2010/06/28 18:31:01 krw Exp $ */
/* $NetBSD: esp.c,v 1.17 1998/09/05 15:15:35 pk Exp $ */
/*
@@ -114,13 +114,6 @@ struct scsi_adapter esp_switch = {
NULL,
};
-struct scsi_device esp_dev = {
- NULL, /* Use default error handler */
- NULL, /* have a queue, served by this */
- NULL, /* have no async handler */
- NULL, /* Use default 'done' routine */
-};
-
/*
* Functions and the switch for the MI code.
*/
@@ -318,7 +311,7 @@ espattach(parent, self, aux)
/*
* Now try to attach all the sub-devices
*/
- ncr53c9x_attach(sc, &esp_switch, &esp_dev);
+ ncr53c9x_attach(sc, &esp_switch);
}
/*
diff --git a/sys/arch/mac68k/dev/ncr5380.c b/sys/arch/mac68k/dev/ncr5380.c
index 201cab11ff6..fcc953ae3ae 100644
--- a/sys/arch/mac68k/dev/ncr5380.c
+++ b/sys/arch/mac68k/dev/ncr5380.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ncr5380.c,v 1.38 2010/03/23 01:57:19 krw Exp $ */
+/* $OpenBSD: ncr5380.c,v 1.39 2010/06/28 18:31:01 krw Exp $ */
/* $NetBSD: ncr5380.c,v 1.38 1996/12/19 21:48:18 scottr Exp $ */
/*
@@ -84,13 +84,6 @@ struct scsi_adapter ncr5380_switch = {
NULL /* free_dev() */
};
-struct scsi_device ncr5380_dev = {
- NULL, /* use default error handler */
- NULL, /* do not have a start functio */
- NULL, /* have no async handler */
- NULL /* Use default done routine */
-};
-
static SC_REQ req_queue[NREQ];
static SC_REQ *free_head = NULL; /* Free request structures */
@@ -237,7 +230,6 @@ void *auxp;
sc->sc_link.adapter_softc = sc;
sc->sc_link.adapter_target = 7;
sc->sc_link.adapter = &ncr5380_switch;
- sc->sc_link.device = &ncr5380_dev;
sc->sc_link.openings = NREQ - 1;
/*
diff --git a/sys/arch/mac68k/dev/sbc.c b/sys/arch/mac68k/dev/sbc.c
index 93ded6121c7..f627bd26335 100644
--- a/sys/arch/mac68k/dev/sbc.c
+++ b/sys/arch/mac68k/dev/sbc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sbc.c,v 1.19 2010/06/26 23:24:43 guenther Exp $ */
+/* $OpenBSD: sbc.c,v 1.20 2010/06/28 18:31:01 krw Exp $ */
/* $NetBSD: sbc.c,v 1.24 1997/04/18 17:38:08 scottr Exp $ */
/*
@@ -84,15 +84,6 @@ struct scsi_adapter sbc_ops = {
NULL, /* free_dev() */
};
-/* This is copied from julian's bt driver */
-/* "so we have a default dev struct for our link struct." */
-struct scsi_device sbc_dev = {
- NULL, /* Use default error handler. */
- NULL, /* Use default start handler. */
- NULL, /* Use default async handler. */
- NULL, /* Use default "done" routine. */
-};
-
struct cfdriver sbc_cd = {
NULL, "sbc", DV_DULL
};
diff --git a/sys/arch/mac68k/dev/sbc_obio.c b/sys/arch/mac68k/dev/sbc_obio.c
index 34c1b494557..2917acde15e 100644
--- a/sys/arch/mac68k/dev/sbc_obio.c
+++ b/sys/arch/mac68k/dev/sbc_obio.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sbc_obio.c,v 1.16 2010/06/26 23:24:43 guenther Exp $ */
+/* $OpenBSD: sbc_obio.c,v 1.17 2010/06/28 18:31:01 krw Exp $ */
/* $NetBSD: sbc_obio.c,v 1.1 1997/03/01 20:18:59 scottr Exp $ */
/*
@@ -166,7 +166,6 @@ sbc_obio_attach(parent, self, args)
ncr_sc->sc_link.adapter_softc = sc;
ncr_sc->sc_link.adapter_target = 7;
ncr_sc->sc_link.adapter = &sbc_ops;
- ncr_sc->sc_link.device = &sbc_dev;
ncr_sc->sc_link.openings = 4;
/*
diff --git a/sys/arch/mac68k/dev/sbcvar.h b/sys/arch/mac68k/dev/sbcvar.h
index acd78c3de51..059413013e7 100644
--- a/sys/arch/mac68k/dev/sbcvar.h
+++ b/sys/arch/mac68k/dev/sbcvar.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: sbcvar.h,v 1.8 2006/12/13 21:12:56 miod Exp $ */
+/* $OpenBSD: sbcvar.h,v 1.9 2010/06/28 18:31:01 krw Exp $ */
/* $NetBSD: sbcvar.h,v 1.1 1997/03/01 20:19:00 scottr Exp $ */
/*
@@ -106,7 +106,6 @@ extern int sbc_debug;
extern int sbc_link_flags;
extern int sbc_options;
extern struct scsi_adapter sbc_ops;
-extern struct scsi_device sbc_dev;
int sbc_pdma_in(struct ncr5380_softc *, int, int, u_char *);
int sbc_pdma_out(struct ncr5380_softc *, int, int, u_char *);
diff --git a/sys/arch/macppc/dev/esp.c b/sys/arch/macppc/dev/esp.c
index 79f02644acd..e7941452123 100644
--- a/sys/arch/macppc/dev/esp.c
+++ b/sys/arch/macppc/dev/esp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: esp.c,v 1.6 2010/06/26 23:24:43 guenther Exp $ */
+/* $OpenBSD: esp.c,v 1.7 2010/06/28 18:31:01 krw Exp $ */
/*-
* Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -139,10 +139,6 @@ struct scsi_adapter esp_switch = {
ncr53c9x_scsi_cmd, scsi_minphys, NULL, NULL,
};
-struct scsi_device esp_dev = {
- NULL, NULL, NULL, NULL,
-};
-
/*
* Functions and the switch for the MI code.
*/
@@ -270,7 +266,7 @@ espattach(struct device *parent, struct device *self, void *aux)
/* Turn on target selection using the `DMA' method */
sc->sc_features |= NCR_F_DMASELECT;
- ncr53c9x_attach(sc, &esp_switch, &esp_dev);
+ ncr53c9x_attach(sc, &esp_switch);
}
diff --git a/sys/arch/macppc/dev/mesh.c b/sys/arch/macppc/dev/mesh.c
index c3862017f85..e5ac438ecc2 100644
--- a/sys/arch/macppc/dev/mesh.c
+++ b/sys/arch/macppc/dev/mesh.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mesh.c,v 1.26 2010/04/09 17:01:30 jasper Exp $ */
+/* $OpenBSD: mesh.c,v 1.27 2010/06/28 18:31:01 krw Exp $ */
/* $NetBSD: mesh.c,v 1.1 1999/02/19 13:06:03 tsubai Exp $ */
/*-
@@ -255,10 +255,6 @@ struct scsi_adapter mesh_switch = {
mesh_scsi_cmd, mesh_minphys, NULL, NULL
};
-struct scsi_device mesh_dev = {
- NULL, NULL, NULL, NULL
-};
-
#define MESH_DATAOUT 0
#define MESH_DATAIN MESH_STATUS0_IO
#define MESH_COMMAND MESH_STATUS0_CD
@@ -354,7 +350,6 @@ mesh_attach(struct device *parent, struct device *self, void *aux)
sc->sc_link.adapter_softc = sc;
sc->sc_link.adapter_target = sc->sc_id;
- sc->sc_link.device = &mesh_dev;
sc->sc_link.adapter = &mesh_switch;
sc->sc_link.openings = 2;
diff --git a/sys/arch/mvme68k/dev/vs.c b/sys/arch/mvme68k/dev/vs.c
index 55b6c108eb0..c50800a64ad 100644
--- a/sys/arch/mvme68k/dev/vs.c
+++ b/sys/arch/mvme68k/dev/vs.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: vs.c,v 1.32 2010/05/20 00:55:17 krw Exp $ */
+/* $OpenBSD: vs.c,v 1.33 2010/06/28 18:31:01 krw Exp $ */
/*
* Copyright (c) 2004, 2009, Miodrag Vallat.
@@ -73,13 +73,6 @@ struct scsi_adapter vs_scsiswitch = {
0, /* no lun support */
};
-struct scsi_device vs_scsidev = {
- NULL, /* use default error handler */
- NULL, /* do not have a start function */
- NULL, /* have no async handler */
- NULL, /* Use default done routine */
-};
-
struct cfattach vs_ca = {
sizeof(struct vs_softc), vsmatch, vsattach,
};
@@ -232,7 +225,6 @@ vsattach(struct device *parent, struct device *self, void *args)
sc_link->adapter_buswidth = vc->vc_width;
sc_link->adapter_softc = sc;
sc_link->adapter_target = vc->vc_id;
- sc_link->device = &vs_scsidev;
if (sc->sc_bid != JAGUAR)
sc_link->luns = 1; /* not enough queues */
sc_link->openings = 1;
diff --git a/sys/arch/mvme68k/dev/vsbic.c b/sys/arch/mvme68k/dev/vsbic.c
index 8d10bec56a1..a20fbff178b 100644
--- a/sys/arch/mvme68k/dev/vsbic.c
+++ b/sys/arch/mvme68k/dev/vsbic.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: vsbic.c,v 1.5 2010/03/23 01:57:19 krw Exp $ */
+/* $OpenBSD: vsbic.c,v 1.6 2010/06/28 18:31:01 krw Exp $ */
/*
* Copyright (c) 2008, 2009 Miodrag Vallat.
@@ -429,13 +429,6 @@ struct scsi_adapter vsbic_swtch = {
scsi_minphys
};
-struct scsi_device vsbic_scsidev = {
- NULL,
- NULL,
- NULL,
- NULL
-};
-
#define MVME327_CSR_ID 0xff
#define MVME327_CSR_SIZE 0x100
@@ -547,7 +540,6 @@ vsbic_attach(struct device *parent, struct device *self, void *args)
sc->sc_link.adapter_buswidth = 8;
sc->sc_link.adapter_softc = sc;
sc->sc_link.adapter_target = sc->sc_id;
- sc->sc_link.device = &vsbic_scsidev;
sc->sc_link.openings = VSBIC_NUMOPENINGS;
bzero(&saa, sizeof saa);
diff --git a/sys/arch/mvme68k/dev/vsdma.c b/sys/arch/mvme68k/dev/vsdma.c
index bafcef817a2..e9373efbccc 100644
--- a/sys/arch/mvme68k/dev/vsdma.c
+++ b/sys/arch/mvme68k/dev/vsdma.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: vsdma.c,v 1.13 2009/02/16 21:19:06 miod Exp $ */
+/* $OpenBSD: vsdma.c,v 1.14 2010/06/28 18:31:01 krw Exp $ */
/*
* Copyright (c) 1999 Steve Murphree, Jr.
* All rights reserved.
@@ -67,13 +67,6 @@ struct scsi_adapter vs_scsiswitch = {
0, /* no lun support */
};
-struct scsi_device vs_scsidev = {
- NULL, /* use default error handler */
- NULL, /* do not have a start function */
- NULL, /* have no async handler */
- NULL, /* Use default done routine */
-};
-
struct cfattach vs_ca = {
sizeof(struct vs_softc), vsmatch, vsattach,
};
@@ -110,7 +103,6 @@ vsattach(parent, self, auxp)
sc->sc_link.adapter_softc = sc;
sc->sc_link.adapter_target = 7;
sc->sc_link.adapter = &vs_scsiswitch;
- sc->sc_link.device = &vs_scsidev;
sc->sc_link.luns = 1;
sc->sc_link.openings = 1;
diff --git a/sys/arch/mvme68k/dev/wdsc.c b/sys/arch/mvme68k/dev/wdsc.c
index 296447b434f..229470ca055 100644
--- a/sys/arch/mvme68k/dev/wdsc.c
+++ b/sys/arch/mvme68k/dev/wdsc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: wdsc.c,v 1.16 2009/02/16 21:19:06 miod Exp $ */
+/* $OpenBSD: wdsc.c,v 1.17 2010/06/28 18:31:01 krw Exp $ */
/*
* Copyright (c) 1996 Steve Woodford
@@ -64,13 +64,6 @@ struct scsi_adapter wdsc_scsiswitch = {
0, /* no lun support */
};
-struct scsi_device wdsc_scsidev = {
- NULL, /* use default error handler */
- NULL, /* do not have a start function */
- NULL, /* have no async handler */
- NULL, /* Use default done routine */
-};
-
struct cfattach wdsc_ca = {
sizeof(struct sbic_softc), (cfmatch_t)wdscmatch, wdscattach
};
@@ -126,7 +119,6 @@ wdscattach(parent, self, aux)
sc->sc_link.adapter_softc = sc;
sc->sc_link.adapter_target = 7;
sc->sc_link.adapter = &wdsc_scsiswitch;
- sc->sc_link.device = &wdsc_scsidev;
sc->sc_link.openings = 2;
sc->sc_sbicp = (sbic_regmap_p)ca->ca_vaddr;
diff --git a/sys/arch/mvme88k/dev/vs.c b/sys/arch/mvme88k/dev/vs.c
index f86e65a3463..639a8c38cce 100644
--- a/sys/arch/mvme88k/dev/vs.c
+++ b/sys/arch/mvme88k/dev/vs.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: vs.c,v 1.80 2010/05/20 00:55:17 krw Exp $ */
+/* $OpenBSD: vs.c,v 1.81 2010/06/28 18:31:01 krw Exp $ */
/*
* Copyright (c) 2004, 2009, Miodrag Vallat.
@@ -74,13 +74,6 @@ struct scsi_adapter vs_scsiswitch = {
0, /* no lun support */
};
-struct scsi_device vs_scsidev = {
- NULL, /* use default error handler */
- NULL, /* do not have a start function */
- NULL, /* have no async handler */
- NULL, /* Use default done routine */
-};
-
struct cfattach vs_ca = {
sizeof(struct vs_softc), vsmatch, vsattach,
};
@@ -217,7 +210,6 @@ vsattach(struct device *parent, struct device *self, void *args)
sc_link->adapter_buswidth = vc->vc_width;
sc_link->adapter_softc = sc;
sc_link->adapter_target = vc->vc_id;
- sc_link->device = &vs_scsidev;
if (sc->sc_bid != JAGUAR)
sc_link->luns = 1; /* not enough queues */
sc_link->openings = 1;
diff --git a/sys/arch/mvme88k/dev/vsbic.c b/sys/arch/mvme88k/dev/vsbic.c
index e65246e4f85..d90d2702e9f 100644
--- a/sys/arch/mvme88k/dev/vsbic.c
+++ b/sys/arch/mvme88k/dev/vsbic.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: vsbic.c,v 1.6 2010/03/23 01:57:19 krw Exp $ */
+/* $OpenBSD: vsbic.c,v 1.7 2010/06/28 18:31:01 krw Exp $ */
/*
* Copyright (c) 2008, 2009 Miodrag Vallat.
@@ -429,13 +429,6 @@ struct scsi_adapter vsbic_swtch = {
scsi_minphys
};
-struct scsi_device vsbic_scsidev = {
- NULL,
- NULL,
- NULL,
- NULL
-};
-
#define MVME327_CSR_ID 0xff
#define MVME327_CSR_SIZE 0x100
@@ -547,7 +540,6 @@ vsbic_attach(struct device *parent, struct device *self, void *args)
sc->sc_link.adapter_buswidth = 8;
sc->sc_link.adapter_softc = sc;
sc->sc_link.adapter_target = sc->sc_id;
- sc->sc_link.device = &vsbic_scsidev;
sc->sc_link.openings = VSBIC_NUMOPENINGS;
bzero(&saa, sizeof saa);
diff --git a/sys/arch/sparc/dev/esp.c b/sys/arch/sparc/dev/esp.c
index 67278090203..85120c54f8e 100644
--- a/sys/arch/sparc/dev/esp.c
+++ b/sys/arch/sparc/dev/esp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: esp.c,v 1.31 2010/06/27 05:52:01 beck Exp $ */
+/* $OpenBSD: esp.c,v 1.32 2010/06/28 18:31:01 krw Exp $ */
/* $NetBSD: esp.c,v 1.69 1997/08/27 11:24:18 bouyer Exp $ */
/*
@@ -140,13 +140,6 @@ struct scsi_adapter esp_switch = {
NULL,
};
-struct scsi_device esp_dev = {
- NULL, /* Use default error handler */
- NULL, /* have a queue, served by this */
- NULL, /* have no async handler */
- NULL, /* Use default 'done' routine */
-};
-
/*
* Functions and the switch for the MI code.
*/
@@ -515,7 +508,7 @@ espattach(parent, self, aux)
sc->sc_features |= NCR_F_DMASELECT;
/* Do the common parts of attachment. */
- ncr53c9x_attach(sc, &esp_switch, &esp_dev);
+ ncr53c9x_attach(sc, &esp_switch);
bootpath_store(1, NULL);
}
diff --git a/sys/arch/sparc/dev/si.c b/sys/arch/sparc/dev/si.c
index 05e24802c0b..320b96e8980 100644
--- a/sys/arch/sparc/dev/si.c
+++ b/sys/arch/sparc/dev/si.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: si.c,v 1.34 2010/06/27 05:52:01 beck Exp $ */
+/* $OpenBSD: si.c,v 1.35 2010/06/28 18:31:01 krw Exp $ */
/* $NetBSD: si.c,v 1.38 1997/08/27 11:24:20 bouyer Exp $ */
/*-
@@ -211,16 +211,6 @@ static struct scsi_adapter si_ops = {
NULL, /* free_dev() */
};
-/* This is copied from julian's bt driver */
-/* "so we have a default dev struct for our link struct." */
-static struct scsi_device si_dev = {
- NULL, /* Use default error handler. */
- NULL, /* Use default start handler. */
- NULL, /* Use default async handler. */
- NULL, /* Use default "done" routine. */
-};
-
-
/* The Sun SCSI-3 VME controller. */
struct cfattach si_ca = {
sizeof(struct si_softc), si_match, si_attach
@@ -332,7 +322,6 @@ si_attach(parent, self, args)
ncr_sc->sc_link.adapter_softc = sc;
ncr_sc->sc_link.adapter_target = 7;
ncr_sc->sc_link.adapter = &si_ops;
- ncr_sc->sc_link.device = &si_dev;
ncr_sc->sc_link.openings = 4;
/*
diff --git a/sys/arch/sparc64/dev/vdsk.c b/sys/arch/sparc64/dev/vdsk.c
index 9edd75d3a93..80eecb1c9f3 100644
--- a/sys/arch/sparc64/dev/vdsk.c
+++ b/sys/arch/sparc64/dev/vdsk.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: vdsk.c,v 1.23 2010/06/15 04:11:34 dlg Exp $ */
+/* $OpenBSD: vdsk.c,v 1.24 2010/06/28 18:31:01 krw Exp $ */
/*
* Copyright (c) 2009 Mark Kettenis
*
@@ -175,10 +175,6 @@ struct cfdriver vdsk_cd = {
NULL, "vdsk", DV_DULL
};
-struct scsi_device vdsk_device = {
- NULL, NULL, NULL, NULL
-};
-
int vdsk_tx_intr(void *);
int vdsk_rx_intr(void *);
@@ -343,7 +339,6 @@ vdsk_attach(struct device *parent, struct device *self, void *aux)
sc->sc_switch.dev_probe = vdsk_dev_probe;
sc->sc_switch.dev_free = vdsk_dev_free;
- sc->sc_link.device = &vdsk_device;
sc->sc_link.adapter = &sc->sc_switch;
sc->sc_link.adapter_softc = self;
sc->sc_link.adapter_buswidth = 2;
diff --git a/sys/arch/vax/dec/sii.c b/sys/arch/vax/dec/sii.c
index 25700b49a16..d86ab79874c 100644
--- a/sys/arch/vax/dec/sii.c
+++ b/sys/arch/vax/dec/sii.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sii.c,v 1.10 2010/06/26 04:04:24 krw Exp $ */
+/* $OpenBSD: sii.c,v 1.11 2010/06/28 18:31:01 krw Exp $ */
/* $NetBSD: sii.c,v 1.42 2000/06/02 20:20:29 mhitch Exp $ */
/*
* Copyright (c) 2008 Miodrag Vallat.
@@ -170,13 +170,6 @@ struct scsi_adapter sii_scsiswitch = {
NULL
};
-struct scsi_device sii_scsidev = {
- NULL,
- NULL,
- NULL,
- NULL
-};
-
void
sii_attach(sc)
struct sii_softc *sc;
@@ -208,7 +201,6 @@ sii_attach(sc)
sc->sc_link.adapter_buswidth = 8;
sc->sc_link.adapter_softc = sc;
sc->sc_link.adapter_target = sc->sc_regs->id & SII_IDMSK;
- sc->sc_link.device = &sii_scsidev;
sc->sc_link.openings = 1; /* driver can't queue requests yet */
/*
diff --git a/sys/arch/vax/vsa/asc_vsbus.c b/sys/arch/vax/vsa/asc_vsbus.c
index f4e5397911d..204d9ad0c01 100644
--- a/sys/arch/vax/vsa/asc_vsbus.c
+++ b/sys/arch/vax/vsa/asc_vsbus.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: asc_vsbus.c,v 1.11 2010/06/26 23:24:44 guenther Exp $ */
+/* $OpenBSD: asc_vsbus.c,v 1.12 2010/06/28 18:31:01 krw Exp $ */
/* $NetBSD: asc_vsbus.c,v 1.22 2001/02/04 20:36:32 ragge Exp $ */
/*-
@@ -111,14 +111,6 @@ struct scsi_adapter asc_vsbus_ops = {
NULL
};
-static struct scsi_device asc_vsbus_dev = {
- NULL, /* Use the default error handler */
- NULL, /* have a queue, served by this */
- NULL, /* have no async handler */
- NULL, /* use the default done handler */
-};
-
-
/*
* Functions and the switch for the MI code
*/
@@ -307,7 +299,7 @@ asc_vsbus_attach(struct device *parent, struct device *self, void *aux)
sc->sc_maxxfer = 64 * 1024;
/* Do the common parts of attachment. */
- ncr53c9x_attach(sc, &asc_vsbus_ops, &asc_vsbus_dev);
+ ncr53c9x_attach(sc, &asc_vsbus_ops);
}
/*
diff --git a/sys/arch/vax/vsa/ncr.c b/sys/arch/vax/vsa/ncr.c
index 769286f1039..1d237775e50 100644
--- a/sys/arch/vax/vsa/ncr.c
+++ b/sys/arch/vax/vsa/ncr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ncr.c,v 1.26 2010/06/26 23:24:44 guenther Exp $ */
+/* $OpenBSD: ncr.c,v 1.27 2010/06/28 18:31:01 krw Exp $ */
/* $NetBSD: ncr.c,v 1.32 2000/06/25 16:00:43 ragge Exp $ */
/*-
@@ -125,13 +125,6 @@ struct scsi_adapter si_ops = {
NULL /* free_dev() */
};
-struct scsi_device si_dev = {
- NULL, /* use default error handler */
- NULL, /* no start function */
- NULL, /* no async handler */
- NULL /* use default done routine */
-};
-
struct cfattach ncr_ca = {
sizeof(struct si_softc), si_match, si_attach
};
@@ -245,7 +238,6 @@ si_attach(parent, self, aux)
ncr_sc->sc_link.adapter_softc = sc;
ncr_sc->sc_link.adapter_target = target;
ncr_sc->sc_link.adapter = &si_ops;
- ncr_sc->sc_link.device = &si_dev;
ncr_sc->sc_link.openings = 4;
/*
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-12 12:48:26 +0000