diff options
68 files changed, 83 insertions, 538 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; /* diff --git a/sys/dev/ata/atascsi.c b/sys/dev/ata/atascsi.c index a55d7429ead..c2e57140e3c 100644 --- a/sys/dev/ata/atascsi.c +++ b/sys/dev/ata/atascsi.c @@ -1,4 +1,4 @@ -/* $OpenBSD: atascsi.c,v 1.86 2010/06/19 21:43:16 krw Exp $ */ +/* $OpenBSD: atascsi.c,v 1.87 2010/06/28 18:31:01 krw Exp $ */ /* * Copyright (c) 2007 David Gwynne <dlg@openbsd.org> @@ -73,10 +73,6 @@ struct scsi_adapter atascsi_switch = { NULL, /* ioctl */ }; -struct scsi_device atascsi_device = { - NULL, NULL, NULL, NULL -}; - void ata_swapcopy(void *, void *, size_t); void atascsi_disk_cmd(struct scsi_xfer *); @@ -136,7 +132,6 @@ atascsi_attach(struct device *self, struct atascsi_attach_args *aaa) as->as_switch.scsi_minphys = aaa->aaa_minphys; /* fill in our scsi_link */ - as->as_link.device = &atascsi_device; as->as_link.adapter = &as->as_switch; as->as_link.adapter_softc = as; as->as_link.adapter_buswidth = aaa->aaa_nports; diff --git a/sys/dev/atapiscsi/atapiscsi.c b/sys/dev/atapiscsi/atapiscsi.c index 3df124fd8cc..d03ecfb5de2 100644 --- a/sys/dev/atapiscsi/atapiscsi.c +++ b/sys/dev/atapiscsi/atapiscsi.c @@ -1,4 +1,4 @@ -/* $OpenBSD: atapiscsi.c,v 1.90 2010/06/15 04:11:34 dlg Exp $ */ +/* $OpenBSD: atapiscsi.c,v 1.91 2010/06/28 18:31:01 krw Exp $ */ /* * This code is derived from code with the copyright below. @@ -177,14 +177,6 @@ static struct scsi_adapter atapiscsi_switch = wdc_atapi_ioctl }; -static struct scsi_device atapiscsi_dev = -{ - NULL, - NULL, - NULL, - NULL, -}; - /* Inital version shares bus_link structure so it can easily be "attached to current" wdc driver */ @@ -249,7 +241,6 @@ atapiscsi_attach(parent, self, aux) as->sc_adapterlink.adapter_target = 7; as->sc_adapterlink.adapter_buswidth = 2; as->sc_adapterlink.adapter = &atapiscsi_switch; - as->sc_adapterlink.device = &atapiscsi_dev; as->sc_adapterlink.luns = 1; as->sc_adapterlink.openings = 1; as->sc_adapterlink.flags = SDEV_ATAPI; diff --git a/sys/dev/eisa/aha1742.c b/sys/dev/eisa/aha1742.c index c4be3d021d4..e880bf75efa 100644 --- a/sys/dev/eisa/aha1742.c +++ b/sys/dev/eisa/aha1742.c @@ -1,4 +1,4 @@ -/* $OpenBSD: aha1742.c,v 1.40 2010/06/26 23:24:44 guenther Exp $ */ +/* $OpenBSD: aha1742.c,v 1.41 2010/06/28 18:31:01 krw Exp $ */ /* $NetBSD: aha1742.c,v 1.61 1996/05/12 23:40:01 mycroft Exp $ */ /* @@ -308,14 +308,6 @@ struct scsi_adapter ahb_switch = { 0, }; -/* the below structure is so we have a default dev struct for our link struct */ -struct scsi_device ahb_dev = { - NULL, /* Use default error handler */ - NULL, /* have a queue, served by this */ - NULL, /* have no async handler */ - NULL, /* Use default 'done' routine */ -}; - int ahbmatch(struct device *, void *, void *); void ahbattach(struct device *, struct device *, void *); @@ -499,7 +491,6 @@ ahbattach(parent, self, aux) sc->sc_link.adapter_softc = sc; sc->sc_link.adapter_target = sc->ahb_scsi_dev; sc->sc_link.adapter = &ahb_switch; - sc->sc_link.device = &ahb_dev; sc->sc_link.openings = 2; if (!strcmp(ea->ea_idstring, "ADP0000")) diff --git a/sys/dev/i2o/ioprbs.c b/sys/dev/i2o/ioprbs.c index e2e3d5ca007..bf7e798217c 100644 --- a/sys/dev/i2o/ioprbs.c +++ b/sys/dev/i2o/ioprbs.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ioprbs.c,v 1.20 2010/03/23 01:57:19 krw Exp $ */ +/* $OpenBSD: ioprbs.c,v 1.21 2010/06/28 18:31:01 krw Exp $ */ /* * Copyright (c) 2001 Niklas Hallqvist @@ -124,10 +124,6 @@ struct scsi_adapter ioprbs_switch = { ioprbs_scsi_cmd, scsi_minphys, 0, 0, }; -struct scsi_device ioprbs_dev = { - NULL, NULL, NULL, NULL -}; - #ifdef I2OVERBOSE static const char *const ioprbs_errors[] = { "success", @@ -345,7 +341,6 @@ ioprbs_attach(struct device *parent, struct device *self, void *aux) /* Fill in the prototype scsi_link. */ sc->sc_link.adapter_softc = sc; sc->sc_link.adapter = &ioprbs_switch; - sc->sc_link.device = &ioprbs_dev; sc->sc_link.openings = 1; sc->sc_link.adapter_buswidth = 1; sc->sc_link.adapter_target = 1; diff --git a/sys/dev/i2o/iopsp.c b/sys/dev/i2o/iopsp.c index 2572fcfd808..d5357df493b 100644 --- a/sys/dev/i2o/iopsp.c +++ b/sys/dev/i2o/iopsp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: iopsp.c,v 1.17 2010/05/20 00:55:17 krw Exp $ */ +/* $OpenBSD: iopsp.c,v 1.18 2010/06/28 18:31:01 krw Exp $ */ /* $NetBSD$ */ /*- @@ -78,10 +78,6 @@ struct scsi_adapter iopsp_switch = { iopsp_scsi_cmd, iopspminphys, 0, 0, }; -struct scsi_device iopsp_dev = { - NULL, NULL, NULL, NULL -}; - void iopsp_adjqparam(struct device *, int); void iopsp_intr(struct device *, struct iop_msg *, void *); int iopsp_rescan(struct iopsp_softc *); @@ -189,7 +185,6 @@ iopsp_attach(struct device *parent, struct device *self, void *aux) sc->sc_link.adapter_softc = sc; sc->sc_link.adapter = &iopsp_switch; sc->sc_link.adapter_target = letoh32(param.p.sci.initiatorid); - sc->sc_link.device = &iopsp_dev; sc->sc_link.openings = 1; sc->sc_link.adapter_buswidth = fcal? IOPSP_MAX_FCAL_TARGET : param.p.sci.maxdatawidth; diff --git a/sys/dev/ic/aac.c b/sys/dev/ic/aac.c index f192533f9be..7bab303cc4e 100644 --- a/sys/dev/ic/aac.c +++ b/sys/dev/ic/aac.c @@ -1,4 +1,4 @@ -/* $OpenBSD: aac.c,v 1.46 2010/05/20 00:55:17 krw Exp $ */ +/* $OpenBSD: aac.c,v 1.47 2010/06/28 18:31:01 krw Exp $ */ /*- * Copyright (c) 2000 Michael Smith @@ -136,10 +136,6 @@ struct scsi_adapter aac_raw_switch = { }; #endif -struct scsi_device aac_dev = { - NULL, NULL, NULL, NULL -}; - /* Falcon/PPC interface */ int aac_fa_get_fwstatus(struct aac_softc *); void aac_fa_qnotify(struct aac_softc *, int); @@ -274,7 +270,6 @@ aac_attach(struct aac_softc *sc) /* Fill in the prototype scsi_link. */ sc->aac_link.adapter_softc = sc; sc->aac_link.adapter = &aac_switch; - sc->aac_link.device = &aac_dev; sc->aac_link.openings = (sc->total_fibs - 8) / (sc->aac_container_count ? sc->aac_container_count : 1); sc->aac_link.adapter_buswidth = AAC_MAX_CONTAINERS; diff --git a/sys/dev/ic/adv.c b/sys/dev/ic/adv.c index 5f54e023499..bd56742bc06 100644 --- a/sys/dev/ic/adv.c +++ b/sys/dev/ic/adv.c @@ -1,4 +1,4 @@ -/* $OpenBSD: adv.c,v 1.31 2010/06/26 23:24:44 guenther Exp $ */ +/* $OpenBSD: adv.c,v 1.32 2010/06/28 18:31:01 krw Exp $ */ /* $NetBSD: adv.c,v 1.6 1998/10/28 20:39:45 dante Exp $ */ /* @@ -93,16 +93,6 @@ struct scsi_adapter adv_switch = }; -/* the below structure is so we have a default dev struct for out link struct */ -struct scsi_device adv_dev = -{ - NULL, /* Use default error handler */ - NULL, /* have a queue, served by this */ - NULL, /* have no async handler */ - NULL, /* Use default 'done' routine */ -}; - - #define ADV_ABORT_TIMEOUT 2000 /* time to wait for abort (mSec) */ #define ADV_WATCH_TIMEOUT 1000 /* time to wait for watchdog (mSec) */ @@ -523,7 +513,6 @@ adv_attach(sc) sc->sc_link.adapter_softc = sc; sc->sc_link.adapter_target = sc->chip_scsi_id; sc->sc_link.adapter = &adv_switch; - sc->sc_link.device = &adv_dev; sc->sc_link.openings = 4; sc->sc_link.adapter_buswidth = 7; diff --git a/sys/dev/ic/adw.c b/sys/dev/ic/adw.c index d510df69c64..805b6be0c9f 100644 --- a/sys/dev/ic/adw.c +++ b/sys/dev/ic/adw.c @@ -1,4 +1,4 @@ -/* $OpenBSD: adw.c,v 1.45 2010/06/26 04:04:24 krw Exp $ */ +/* $OpenBSD: adw.c,v 1.46 2010/06/28 18:31:01 krw Exp $ */ /* $NetBSD: adw.c,v 1.23 2000/05/27 18:24:50 dante Exp $ */ /* @@ -86,16 +86,6 @@ struct cfdriver adw_cd = { NULL, "adw", DV_DULL }; -/* the below structure is so we have a default dev struct for our link struct */ -struct scsi_device adw_dev = -{ - NULL, /* Use default error handler */ - NULL, /* have a queue, served by this */ - NULL, /* have no async handler */ - NULL, /* Use default 'done' routine */ -}; - - /******************************************************************************/ /* DMA Mapping for Control Blocks */ /******************************************************************************/ @@ -562,7 +552,6 @@ adw_attach(sc) sc->sc_link.adapter_softc = sc; sc->sc_link.adapter_target = sc->chip_scsi_id; sc->sc_link.adapter = &sc->sc_adapter; - sc->sc_link.device = &adw_dev; sc->sc_link.openings = 4; sc->sc_link.adapter_buswidth = ADW_MAX_TID+1; diff --git a/sys/dev/ic/aic6360.c b/sys/dev/ic/aic6360.c index 148f8b25406..ca796621ee1 100644 --- a/sys/dev/ic/aic6360.c +++ b/sys/dev/ic/aic6360.c @@ -1,4 +1,4 @@ -/* $OpenBSD: aic6360.c,v 1.24 2010/06/26 23:24:44 guenther Exp $ */ +/* $OpenBSD: aic6360.c,v 1.25 2010/06/28 18:31:02 krw Exp $ */ /* $NetBSD: aic6360.c,v 1.52 1996/12/10 21:27:51 thorpej Exp $ */ #ifdef DDB @@ -198,14 +198,6 @@ struct scsi_adapter aic_switch = { 0, }; -struct scsi_device aic_dev = { - NULL, /* Use default error handler */ - NULL, /* have a queue, served by this */ - NULL, /* have no async handler */ - NULL, /* Use default 'done' routine */ -}; - - /* * Do the real search-for-device. */ @@ -287,7 +279,6 @@ aicattach(struct aic_softc *sc) sc->sc_link.adapter_softc = sc; sc->sc_link.adapter_target = sc->sc_initiator; sc->sc_link.adapter = &aic_switch; - sc->sc_link.device = &aic_dev; sc->sc_link.openings = 2; bzero(&saa, sizeof(saa)); diff --git a/sys/dev/ic/aic79xx_openbsd.c b/sys/dev/ic/aic79xx_openbsd.c index 5ed0e0f8a26..bba6da338e3 100644 --- a/sys/dev/ic/aic79xx_openbsd.c +++ b/sys/dev/ic/aic79xx_openbsd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: aic79xx_openbsd.c,v 1.36 2010/03/23 01:57:19 krw Exp $ */ +/* $OpenBSD: aic79xx_openbsd.c,v 1.37 2010/06/28 18:31:02 krw Exp $ */ /* * Copyright (c) 2004 Milos Urbanek, Kenneth R. Westerback & Marco Peereboom @@ -95,15 +95,6 @@ static struct scsi_adapter ahd_switch = 0, }; -/* the below structure is so we have a default dev struct for our link struct */ -static struct scsi_device ahd_dev = -{ - NULL, /* Use default error handler */ - NULL, /* have a queue, served by this */ - NULL, /* have no async handler */ - NULL, /* Use default 'done' routine */ -}; - /* * Attach all the sub-devices we can find */ @@ -127,7 +118,6 @@ ahd_attach(struct ahd_softc *ahd) ahd->sc_channel.adapter_softc = ahd; ahd->sc_channel.adapter = &ahd_switch; ahd->sc_channel.openings = 16; - ahd->sc_channel.device = &ahd_dev; if (bootverbose) { ahd_controller_info(ahd, ahd_info, sizeof ahd_info); diff --git a/sys/dev/ic/aic7xxx_openbsd.c b/sys/dev/ic/aic7xxx_openbsd.c index 953bf316d13..ebca6a2989d 100644 --- a/sys/dev/ic/aic7xxx_openbsd.c +++ b/sys/dev/ic/aic7xxx_openbsd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: aic7xxx_openbsd.c,v 1.47 2010/06/02 08:19:35 dlg Exp $ */ +/* $OpenBSD: aic7xxx_openbsd.c,v 1.48 2010/06/28 18:31:02 krw Exp $ */ /* $NetBSD: aic7xxx_osm.c,v 1.14 2003/11/02 11:07:44 wiz Exp $ */ /* @@ -69,15 +69,6 @@ static struct scsi_adapter ahc_switch = 0, }; -/* the below structure is so we have a default dev struct for our link struct */ -static struct scsi_device ahc_dev = -{ - NULL, /* Use default error handler */ - NULL, /* have a queue, served by this */ - NULL, /* have no async handler */ - NULL, /* Use default 'done' routine */ -}; - /* * Attach all the sub-devices we can find */ @@ -98,7 +89,6 @@ ahc_attach(struct ahc_softc *ahc) ahc->sc_channel.adapter_softc = ahc; ahc->sc_channel.adapter = &ahc_switch; ahc->sc_channel.openings = 16; - ahc->sc_channel.device = &ahc_dev; if (ahc->features & AHC_TWIN) { /* Configure the second scsi bus */ diff --git a/sys/dev/ic/ami.c b/sys/dev/ic/ami.c index d0dcfa34310..659a60d01a2 100644 --- a/sys/dev/ic/ami.c +++ b/sys/dev/ic/ami.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ami.c,v 1.210 2010/06/28 05:43:46 jsg Exp $ */ +/* $OpenBSD: ami.c,v 1.211 2010/06/28 18:31:02 krw Exp $ */ /* * Copyright (c) 2001 Michael Shalayeff @@ -100,20 +100,12 @@ struct scsi_adapter ami_switch = { ami_scsi_cmd, amiminphys, 0, 0, ami_scsi_ioctl }; -struct scsi_device ami_dev = { - NULL, NULL, NULL, NULL -}; - void ami_scsi_raw_cmd(struct scsi_xfer *); struct scsi_adapter ami_raw_switch = { ami_scsi_raw_cmd, amiminphys, 0, 0, }; -struct scsi_device ami_raw_dev = { - NULL, NULL, NULL, NULL -}; - void * ami_get_ccb(void *); void ami_put_ccb(void *, void *); @@ -529,7 +521,6 @@ ami_attach(struct ami_softc *sc) /* TODO: fetch & print cache strategy */ /* TODO: fetch & print scsi and raid info */ - sc->sc_link.device = &ami_dev; sc->sc_link.adapter_softc = sc; sc->sc_link.adapter = &ami_switch; sc->sc_link.adapter_target = sc->sc_maxunits; @@ -590,7 +581,6 @@ ami_attach(struct ami_softc *sc) rsc->sc_softc = sc; rsc->sc_channel = rsc - sc->sc_rawsoftcs; - rsc->sc_link.device = &ami_raw_dev; rsc->sc_link.openings = AMI_MAXRAWCMDS; rsc->sc_link.adapter_softc = rsc; rsc->sc_link.adapter = &ami_raw_switch; diff --git a/sys/dev/ic/bha.c b/sys/dev/ic/bha.c index 27efefda195..9d380cdc1f0 100644 --- a/sys/dev/ic/bha.c +++ b/sys/dev/ic/bha.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bha.c,v 1.24 2010/06/26 23:24:44 guenther Exp $ */ +/* $OpenBSD: bha.c,v 1.25 2010/06/28 18:31:02 krw Exp $ */ /* $NetBSD: bha.c,v 1.27 1998/11/19 21:53:00 thorpej Exp $ */ #undef BHADEBUG @@ -101,14 +101,6 @@ struct cfdriver bha_cd = { NULL, "bha", DV_DULL }; -/* the below structure is so we have a default dev struct for out link struct */ -struct scsi_device bha_dev = { - NULL, /* Use default error handler */ - NULL, /* have a queue, served by this */ - NULL, /* have no async handler */ - NULL, /* Use default 'done' routine */ -}; - #define BHA_RESET_TIMEOUT 2000 /* time to wait for reset (mSec) */ #define BHA_ABORT_TIMEOUT 2000 /* time to wait for abort (mSec) */ @@ -272,7 +264,6 @@ bha_attach(sc, bpd) sc->sc_link.adapter_softc = sc; sc->sc_link.adapter_target = bpd->sc_scsi_dev; sc->sc_link.adapter = &sc->sc_adapter; - sc->sc_link.device = &bha_dev; sc->sc_link.openings = 4; TAILQ_INIT(&sc->sc_free_ccb); diff --git a/sys/dev/ic/cac.c b/sys/dev/ic/cac.c index 25bbf52da87..090cfb4f10a 100644 --- a/sys/dev/ic/cac.c +++ b/sys/dev/ic/cac.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cac.c,v 1.38 2010/05/20 00:55:17 krw Exp $ */ +/* $OpenBSD: cac.c,v 1.39 2010/06/28 18:31:02 krw Exp $ */ /* $NetBSD: cac.c,v 1.15 2000/11/08 19:20:35 ad Exp $ */ /* @@ -103,10 +103,6 @@ struct scsi_adapter cac_switch = { cac_scsi_cmd, cacminphys, 0, 0, }; -struct scsi_device cac_dev = { - NULL, NULL, NULL, NULL -}; - struct cac_ccb *cac_ccb_alloc(struct cac_softc *, int); void cac_ccb_done(struct cac_softc *, struct cac_ccb *); void cac_ccb_free(struct cac_softc *, struct cac_ccb *); @@ -246,7 +242,6 @@ cac_init(struct cac_softc *sc, int startfw) sc->sc_link.adapter = &cac_switch; sc->sc_link.adapter_target = cinfo.num_drvs; sc->sc_link.adapter_buswidth = cinfo.num_drvs; - sc->sc_link.device = &cac_dev; sc->sc_link.openings = CAC_MAX_CCBS / sc->sc_nunits; if (sc->sc_link.openings < 4 ) sc->sc_link.openings = 4; diff --git a/sys/dev/ic/ciss.c b/sys/dev/ic/ciss.c index 74a9d090a4f..1e8c8782c4a 100644 --- a/sys/dev/ic/ciss.c +++ b/sys/dev/ic/ciss.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ciss.c,v 1.56 2010/06/26 22:14:32 krw Exp $ */ +/* $OpenBSD: ciss.c,v 1.57 2010/06/28 18:31:02 krw Exp $ */ /* * Copyright (c) 2005,2006 Michael Shalayeff @@ -76,10 +76,6 @@ struct scsi_adapter ciss_switch = { ciss_scsi_cmd, cissminphys, NULL, NULL, ciss_scsi_ioctl }; -struct scsi_device ciss_dev = { - NULL, NULL, NULL, NULL -}; - #if NBIO > 0 int ciss_ioctl(struct device *, u_long, caddr_t); #endif @@ -367,7 +363,6 @@ ciss_attach(struct ciss_softc *sc) return -1; } - sc->sc_link.device = &ciss_dev; sc->sc_link.adapter_softc = sc; sc->sc_link.openings = sc->maxcmd / (sc->maxunits? sc->maxunits : 1); sc->sc_link.adapter = &ciss_switch; diff --git a/sys/dev/ic/dpt.c b/sys/dev/ic/dpt.c index c4cdab8c1b6..ccd9b7b1046 100644 --- a/sys/dev/ic/dpt.c +++ b/sys/dev/ic/dpt.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dpt.c,v 1.25 2010/05/20 00:55:17 krw Exp $ */ +/* $OpenBSD: dpt.c,v 1.26 2010/06/28 18:31:02 krw Exp $ */ /* $NetBSD: dpt.c,v 1.12 1999/10/23 16:26:33 ad Exp $ */ /*- @@ -95,18 +95,15 @@ struct cfdriver dpt_cd = { }; #endif /* __OpenBSD__ */ -/* A default for our link struct */ #ifdef __NetBSD__ +/* A default for our link struct */ static struct scsipi_device dpt_dev = { -#endif /* __NetBSD__ */ -#ifdef __OpenBSD__ -static struct scsi_device dpt_dev = { -#endif /* __OpenBSD__ */ NULL, /* Use default error handler */ NULL, /* have a queue, served by this */ NULL, /* have no async handler */ NULL, /* Use default 'done' routine */ }; +#endif /* __NetBSD__ */ #ifndef offsetof #define offsetof(type, member) (int)((&((type *)0)->member)) @@ -394,6 +391,7 @@ dpt_init(sc, intrstr) link->scsipi_scsi.max_lun = ec->ec_maxlun; link->scsipi_scsi.max_target = ec->ec_maxtarget; link->type = BUS_SCSI; + link->device = &dpt_dev; #endif /* __NetBSD__ */ #ifdef __OpenBSD__ link->scsibus = i; @@ -401,7 +399,6 @@ dpt_init(sc, intrstr) link->luns = ec->ec_maxlun + 1; link->adapter_buswidth = ec->ec_maxtarget + 1; #endif /* __OpenBSD__ */ - link->device = &dpt_dev; link->adapter = &sc->sc_adapter; link->adapter_softc = sc; link->openings = sc->sc_nccbs; diff --git a/sys/dev/ic/gdt_common.c b/sys/dev/ic/gdt_common.c index e6eb2eb2606..01ff8c10acb 100644 --- a/sys/dev/ic/gdt_common.c +++ b/sys/dev/ic/gdt_common.c @@ -1,4 +1,4 @@ -/* $OpenBSD: gdt_common.c,v 1.50 2010/05/20 00:55:17 krw Exp $ */ +/* $OpenBSD: gdt_common.c,v 1.51 2010/06/28 18:31:02 krw Exp $ */ /* * Copyright (c) 1999, 2000, 2003 Niklas Hallqvist. All rights reserved. @@ -103,10 +103,6 @@ struct scsi_adapter gdt_raw_switch = { gdt_raw_scsi_cmd, gdtminphys, 0, 0, }; -struct scsi_device gdt_dev = { - NULL, NULL, NULL, NULL -}; - int gdt_cnt = 0; u_int8_t gdt_polling; u_int8_t gdt_from_wait; @@ -161,7 +157,6 @@ gdt_attach(struct gdt_softc *sc) /* Fill in the prototype scsi_link. */ sc->sc_link.adapter_softc = sc; sc->sc_link.adapter = &gdt_switch; - sc->sc_link.device = &gdt_dev; /* openings will be filled in later. */ sc->sc_link.adapter_buswidth = (sc->sc_class & GDT_FC) ? GDT_MAXID : GDT_MAX_HDRIVES; @@ -499,7 +494,6 @@ gdt_attach(struct gdt_softc *sc) sc->sc_raw_link[i].adapter_softc = sc; sc->sc_raw_link[i].adapter = &gdt_raw_switch; sc->sc_raw_link[i].adapter_target = 7; - sc->sc_raw_link[i].device = &gdt_dev; sc->sc_raw_link[i].openings = 4; /* XXX a guess */ sc->sc_raw_link[i].adapter_buswidth = (sc->sc_class & GDT_FC) ? GDT_MAXID : 16; /* XXX */ diff --git a/sys/dev/ic/iha.c b/sys/dev/ic/iha.c index 7ad622b13fe..df700a9808d 100644 --- a/sys/dev/ic/iha.c +++ b/sys/dev/ic/iha.c @@ -1,4 +1,4 @@ -/* $OpenBSD: iha.c,v 1.38 2010/05/20 00:55:17 krw Exp $ */ +/* $OpenBSD: iha.c,v 1.39 2010/06/28 18:31:02 krw Exp $ */ /*------------------------------------------------------------------------- * * Device driver for the INI-9XXXU/UW or INIC-940/950 PCI SCSI Controller. @@ -60,13 +60,6 @@ struct scsi_adapter iha_switch = { NULL /* free_dev() */ }; -struct scsi_device iha_dev = { - NULL, /* Use default error handler */ - NULL, /* have a queue, served by this */ - NULL, /* have no async handler */ - NULL, /* Use default 'done' routine */ -}; - /* * SCSI Rate Table, indexed by FLAG_SCSI_RATE field of * TCS_Flags. @@ -373,7 +366,6 @@ iha_init_tulip(sc) */ sc->sc_link.adapter_softc = sc; sc->sc_link.adapter = &iha_switch; - sc->sc_link.device = &iha_dev; sc->sc_link.openings = 4; /* # xs's allowed per device */ sc->sc_link.adapter_target = pScsi->NVM_SCSI_Id; sc->sc_link.adapter_buswidth = pScsi->NVM_SCSI_Targets; diff --git a/sys/dev/ic/isp_openbsd.c b/sys/dev/ic/isp_openbsd.c index 5ae1db210c2..95bb99140fc 100644 --- a/sys/dev/ic/isp_openbsd.c +++ b/sys/dev/ic/isp_openbsd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: isp_openbsd.c,v 1.43 2010/03/27 02:06:03 krw Exp $ */ +/* $OpenBSD: isp_openbsd.c,v 1.44 2010/06/28 18:31:02 krw Exp $ */ /* * Platform (OpenBSD) dependent common attachment code for QLogic adapters. * @@ -64,8 +64,6 @@ static void ispminphys(struct buf *, struct scsi_link *); static void ispcmd_slow(XS_T *); static void ispcmd(XS_T *); -struct scsi_device isp_dev = { NULL, NULL, NULL, NULL }; - void isp_polled_cmd (struct ispsoftc *, XS_T *); void isp_wdog (void *); void isp_make_here(ispsoftc_t *, int); @@ -106,7 +104,6 @@ isp_attach(struct ispsoftc *isp) isp->isp_osinfo.wqf = isp->isp_osinfo.wqt = NULL; lptr->adapter_softc = isp; - lptr->device = &isp_dev; lptr->adapter = &isp->isp_osinfo._adapter; lptr->openings = imin(isp->isp_maxcmds, MAXISPREQUEST(isp)); isp->isp_osinfo._adapter.scsi_cmd = ispcmd_slow; @@ -124,7 +121,6 @@ isp_attach(struct ispsoftc *isp) if (IS_DUALBUS(isp)) { struct scsi_link *lptrb = &isp->isp_osinfo._link[1]; lptrb->adapter_softc = isp; - lptrb->device = &isp_dev; lptrb->adapter = &isp->isp_osinfo._adapter; lptrb->openings = lptr->openings; lptrb->adapter_buswidth = MAX_TARGETS; diff --git a/sys/dev/ic/mfi.c b/sys/dev/ic/mfi.c index 5ff67943330..d710ba652d6 100644 --- a/sys/dev/ic/mfi.c +++ b/sys/dev/ic/mfi.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mfi.c,v 1.106 2010/06/15 04:11:34 dlg Exp $ */ +/* $OpenBSD: mfi.c,v 1.107 2010/06/28 18:31:02 krw Exp $ */ /* * Copyright (c) 2006 Marco Peereboom <marco@peereboom.us> * @@ -63,10 +63,6 @@ struct scsi_adapter mfi_switch = { mfi_scsi_cmd, mfiminphys, 0, 0, mfi_scsi_ioctl }; -struct scsi_device mfi_dev = { - NULL, NULL, NULL, NULL -}; - struct mfi_ccb *mfi_get_ccb(struct mfi_softc *); void mfi_put_ccb(struct mfi_ccb *); int mfi_init_ccb(struct mfi_softc *); @@ -718,7 +714,6 @@ mfi_attach(struct mfi_softc *sc, enum mfi_iop iop) else sc->sc_link.openings = sc->sc_max_cmds; - sc->sc_link.device = &mfi_dev; sc->sc_link.adapter_softc = sc; sc->sc_link.adapter = &mfi_switch; sc->sc_link.adapter_target = MFI_MAX_LD; diff --git a/sys/dev/ic/mpi.c b/sys/dev/ic/mpi.c index ee3a74de361..e13a4878ff5 100644 --- a/sys/dev/ic/mpi.c +++ b/sys/dev/ic/mpi.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mpi.c,v 1.151 2010/06/15 04:30:26 dlg Exp $ */ +/* $OpenBSD: mpi.c,v 1.152 2010/06/28 18:31:02 krw Exp $ */ /* * Copyright (c) 2005, 2006, 2009 David Gwynne <dlg@openbsd.org> @@ -78,13 +78,6 @@ struct scsi_adapter mpi_switch = { mpi_scsi_ioctl }; -struct scsi_device mpi_dev = { - NULL, - NULL, - NULL, - NULL -}; - struct mpi_dmamem *mpi_dmamem_alloc(struct mpi_softc *, size_t); void mpi_dmamem_free(struct mpi_softc *, struct mpi_dmamem *); @@ -328,7 +321,6 @@ mpi_attach(struct mpi_softc *sc) #endif /* NBIO > 0 */ /* we should be good to go now, attach scsibus */ - sc->sc_link.device = &mpi_dev; sc->sc_link.adapter = &mpi_switch; sc->sc_link.adapter_softc = sc; sc->sc_link.adapter_target = sc->sc_target; diff --git a/sys/dev/ic/ncr53c9x.c b/sys/dev/ic/ncr53c9x.c index 1ac3d435d06..691887aed7b 100644 --- a/sys/dev/ic/ncr53c9x.c +++ b/sys/dev/ic/ncr53c9x.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ncr53c9x.c,v 1.47 2010/06/26 23:24:44 guenther Exp $ */ +/* $OpenBSD: ncr53c9x.c,v 1.48 2010/06/28 18:31:02 krw Exp $ */ /* $NetBSD: ncr53c9x.c,v 1.56 2000/11/30 14:41:46 thorpej Exp $ */ /* @@ -185,10 +185,9 @@ ncr53c9x_lunsearch(ti, lun) * Attach this instance, and then all the sub-devices */ void -ncr53c9x_attach(sc, adapter, dev) +ncr53c9x_attach(sc, adapter) struct ncr53c9x_softc *sc; struct scsi_adapter *adapter; - struct scsi_device *dev; { struct scsibus_attach_args saa; @@ -265,7 +264,6 @@ ncr53c9x_attach(sc, adapter, dev) sc->sc_link.adapter_softc = sc; sc->sc_link.adapter_target = sc->sc_id; sc->sc_link.adapter = adapter; - sc->sc_link.device = dev; sc->sc_link.openings = 2; sc->sc_link.adapter_buswidth = sc->sc_ntarg; diff --git a/sys/dev/ic/ncr53c9xvar.h b/sys/dev/ic/ncr53c9xvar.h index 00761c471a5..65c8208d586 100644 --- a/sys/dev/ic/ncr53c9xvar.h +++ b/sys/dev/ic/ncr53c9xvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: ncr53c9xvar.h,v 1.19 2010/03/23 01:57:19 krw Exp $ */ +/* $OpenBSD: ncr53c9xvar.h,v 1.20 2010/06/28 18:31:02 krw Exp $ */ /* $NetBSD: ncr53c9xvar.h,v 1.13 1998/05/26 23:17:34 thorpej Exp $ */ /*- @@ -425,7 +425,7 @@ struct ncr53c9x_softc { ((250 * (cpb)) / (sc)->sc_freq) void ncr53c9x_attach(struct ncr53c9x_softc *, - struct scsi_adapter *, struct scsi_device *); + struct scsi_adapter *); void ncr53c9x_scsi_cmd(struct scsi_xfer *); void ncr53c9x_reset(struct ncr53c9x_softc *); int ncr53c9x_intr(void *); diff --git a/sys/dev/ic/oosiop.c b/sys/dev/ic/oosiop.c index 28d46e3eed4..5f922ff3448 100644 --- a/sys/dev/ic/oosiop.c +++ b/sys/dev/ic/oosiop.c @@ -1,4 +1,4 @@ -/* $OpenBSD: oosiop.c,v 1.16 2010/05/19 15:27:35 oga Exp $ */ +/* $OpenBSD: oosiop.c,v 1.17 2010/06/28 18:31:02 krw Exp $ */ /* $NetBSD: oosiop.c,v 1.4 2003/10/29 17:45:55 tsutsui Exp $ */ /* @@ -135,13 +135,6 @@ struct scsi_adapter oosiop_adapter = { NULL }; -struct scsi_device oosiop_dev = { - NULL, - NULL, - NULL, - NULL -}; - void oosiop_attach(struct oosiop_softc *sc) { @@ -242,7 +235,6 @@ oosiop_attach(struct oosiop_softc *sc) */ sc->sc_link.adapter = &oosiop_adapter; sc->sc_link.adapter_softc = sc; - sc->sc_link.device = &oosiop_dev; sc->sc_link.openings = 1; /* XXX */ sc->sc_link.adapter_buswidth = OOSIOP_NTGT; sc->sc_link.adapter_target = sc->sc_id; diff --git a/sys/dev/ic/osiop.c b/sys/dev/ic/osiop.c index a5665f523b8..57675a2cf1b 100644 --- a/sys/dev/ic/osiop.c +++ b/sys/dev/ic/osiop.c @@ -1,4 +1,4 @@ -/* $OpenBSD: osiop.c,v 1.44 2010/06/28 04:39:57 dlg Exp $ */ +/* $OpenBSD: osiop.c,v 1.45 2010/06/28 18:31:02 krw Exp $ */ /* $NetBSD: osiop.c,v 1.9 2002/04/05 18:27:54 bouyer Exp $ */ /* @@ -187,13 +187,6 @@ struct scsi_adapter osiop_adapter = { NULL, }; -struct scsi_device osiop_dev = { - NULL, - NULL, - NULL, - NULL, -}; - void osiop_attach(sc) struct osiop_softc *sc; @@ -340,7 +333,6 @@ osiop_attach(sc) */ sc->sc_link.adapter = &osiop_adapter; sc->sc_link.adapter_softc = sc; - sc->sc_link.device = &osiop_dev; sc->sc_link.openings = 4; sc->sc_link.adapter_buswidth = OSIOP_NTGT; sc->sc_link.adapter_target = sc->sc_id; diff --git a/sys/dev/ic/siop.c b/sys/dev/ic/siop.c index 89185a69dbf..daefcb5d54f 100644 --- a/sys/dev/ic/siop.c +++ b/sys/dev/ic/siop.c @@ -1,4 +1,4 @@ -/* $OpenBSD: siop.c,v 1.59 2010/06/03 11:37:45 krw Exp $ */ +/* $OpenBSD: siop.c,v 1.60 2010/06/28 18:31:02 krw Exp $ */ /* $NetBSD: siop.c,v 1.79 2005/11/18 23:10:32 bouyer Exp $ */ /* @@ -111,13 +111,6 @@ struct scsi_adapter siop_adapter = { NULL, }; -struct scsi_device siop_dev = { - NULL, - NULL, - NULL, - NULL, -}; - #ifdef SIOP_STATS static int siop_stat_intr = 0; static int siop_stat_intr_shortxfer = 0; @@ -201,7 +194,6 @@ siop_attach(sc) scsi_iopool_init(&sc->iopool, sc, siop_cmd_get, siop_cmd_put); sc->sc_currschedslot = 0; sc->sc_c.sc_link.adapter = &siop_adapter; - sc->sc_c.sc_link.device = &siop_dev; sc->sc_c.sc_link.openings = SIOP_NTAG; sc->sc_c.sc_link.pool = &sc->iopool; diff --git a/sys/dev/ic/trm.c b/sys/dev/ic/trm.c index 460a904e314..8788eace01d 100644 --- a/sys/dev/ic/trm.c +++ b/sys/dev/ic/trm.c @@ -1,4 +1,4 @@ -/* $OpenBSD: trm.c,v 1.20 2010/06/19 21:43:16 krw Exp $ +/* $OpenBSD: trm.c,v 1.21 2010/06/28 18:31:02 krw Exp $ * ------------------------------------------------------------ * O.S : OpenBSD * File Name : trm.c @@ -139,13 +139,6 @@ struct scsi_adapter trm_switch = { NULL }; -static struct scsi_device trm_device = { - NULL, /* Use default error handler */ - NULL, /* have a queue, served by this */ - NULL, /* have no async handler */ - NULL, /* Use default 'done' routine */ -}; - /* * ------------------------------------------------------------ * @@ -2435,7 +2428,6 @@ trm_initACB(struct trm_softc *sc, int unit) sc->sc_link.adapter_softc = sc; sc->sc_link.adapter_target = sc->sc_AdaptSCSIID; sc->sc_link.openings = 30; /* So TagMask (32 bit integer) always has space */ - sc->sc_link.device = &trm_device; sc->sc_link.adapter = &sc->sc_adapter; sc->sc_link.adapter_buswidth = ((sc->sc_config & HCC_WIDE_CARD) == 0) ? 8:16; diff --git a/sys/dev/ic/twe.c b/sys/dev/ic/twe.c index 3d1b02dac5f..2e1751dfaa6 100644 --- a/sys/dev/ic/twe.c +++ b/sys/dev/ic/twe.c @@ -1,4 +1,4 @@ -/* $OpenBSD: twe.c,v 1.36 2010/05/20 00:55:17 krw Exp $ */ +/* $OpenBSD: twe.c,v 1.37 2010/06/28 18:31:02 krw Exp $ */ /* * Copyright (c) 2000-2002 Michael Shalayeff. All rights reserved. @@ -70,10 +70,6 @@ struct scsi_adapter twe_switch = { twe_scsi_cmd, tweminphys, 0, 0, }; -struct scsi_device twe_dev = { - NULL, NULL, NULL, NULL -}; - static __inline struct twe_ccb *twe_get_ccb(struct twe_softc *sc); static __inline void twe_put_ccb(struct twe_ccb *ccb); void twe_dispose(struct twe_softc *sc); @@ -383,7 +379,6 @@ twe_attach(sc) sc->sc_link.adapter_softc = sc; sc->sc_link.adapter = &twe_switch; sc->sc_link.adapter_target = TWE_MAX_UNITS; - sc->sc_link.device = &twe_dev; sc->sc_link.openings = TWE_MAXCMDS / nunits; sc->sc_link.adapter_buswidth = TWE_MAX_UNITS; diff --git a/sys/dev/ic/uha.c b/sys/dev/ic/uha.c index 2f68bedbabe..c5acaa50b57 100644 --- a/sys/dev/ic/uha.c +++ b/sys/dev/ic/uha.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uha.c,v 1.18 2010/06/26 23:24:44 guenther Exp $ */ +/* $OpenBSD: uha.c,v 1.19 2010/06/28 18:31:02 krw Exp $ */ /* $NetBSD: uha.c,v 1.3 1996/10/13 01:37:29 christos Exp $ */ #undef UHADEBUG @@ -96,14 +96,6 @@ struct scsi_adapter uha_switch = { 0, }; -/* the below structure is so we have a default dev struct for out link struct */ -struct scsi_device uha_dev = { - NULL, /* Use default error handler */ - NULL, /* have a queue, served by this */ - NULL, /* have no async handler */ - NULL, /* Use default 'done' routine */ -}; - struct cfdriver uha_cd = { NULL, "uha", DV_DULL }; @@ -143,7 +135,6 @@ uha_attach(sc) sc->sc_link.adapter_softc = sc; sc->sc_link.adapter_target = sc->sc_scsi_dev; sc->sc_link.adapter = &uha_switch; - sc->sc_link.device = &uha_dev; sc->sc_link.openings = 2; bzero(&saa, sizeof(saa)); diff --git a/sys/dev/isa/aha.c b/sys/dev/isa/aha.c index 1ba599c9959..7892fb223d4 100644 --- a/sys/dev/isa/aha.c +++ b/sys/dev/isa/aha.c @@ -1,4 +1,4 @@ -/* $OpenBSD: aha.c,v 1.70 2010/06/26 23:24:44 guenther Exp $ */ +/* $OpenBSD: aha.c,v 1.71 2010/06/28 18:31:02 krw Exp $ */ /* $NetBSD: aha.c,v 1.11 1996/05/12 23:51:23 mycroft Exp $ */ #undef AHADIAG @@ -161,14 +161,6 @@ struct scsi_adapter aha_switch = { 0, }; -/* the below structure is so we have a default dev struct for out link struct */ -struct scsi_device aha_dev = { - NULL, /* Use default error handler */ - NULL, /* have a queue, served by this */ - NULL, /* have no async handler */ - NULL, /* Use default 'done' routine */ -}; - int aha_isapnp_probe(struct device *, void *, void *); int ahaprobe(struct device *, void *, void *); void ahaattach(struct device *, struct device *, void *); @@ -399,7 +391,6 @@ ahaattach(parent, self, aux) sc->sc_link.adapter_softc = sc; sc->sc_link.adapter_target = sc->sc_scsi_dev; sc->sc_link.adapter = &aha_switch; - sc->sc_link.device = &aha_dev; sc->sc_link.openings = 2; bzero(&saa, sizeof(saa)); diff --git a/sys/dev/isa/seagate.c b/sys/dev/isa/seagate.c index 2caee4c46a9..f678fa2e176 100644 --- a/sys/dev/isa/seagate.c +++ b/sys/dev/isa/seagate.c @@ -1,4 +1,4 @@ -/* $OpenBSD: seagate.c,v 1.35 2010/06/26 23:24:44 guenther Exp $ */ +/* $OpenBSD: seagate.c,v 1.36 2010/06/28 18:31:02 krw Exp $ */ /* * ST01/02, Future Domain TMC-885, TMC-950 SCSI driver @@ -295,14 +295,6 @@ struct scsi_adapter sea_switch = { 0, }; -/* the below structure is so we have a default dev struct for our link struct */ -struct scsi_device sea_dev = { - NULL, /* use default error handler */ - NULL, /* have a queue, served by this */ - NULL, /* have no async handler */ - NULL, /* Use default 'done' routine */ -}; - int seaprobe(struct device *, void *, void *); void seaattach(struct device *, struct device *, void *); int seaprint(void *, const char *); @@ -434,7 +426,6 @@ seaattach(struct device *parent, struct device *self, void *aux) sea->sc_link.adapter_softc = sea; sea->sc_link.adapter_target = sea->our_id; sea->sc_link.adapter = &sea_switch; - sea->sc_link.device = &sea_dev; sea->sc_link.openings = 1; printf("\n"); diff --git a/sys/dev/isa/wds.c b/sys/dev/isa/wds.c index 1e4e6c7f554..9660b92820b 100644 --- a/sys/dev/isa/wds.c +++ b/sys/dev/isa/wds.c @@ -1,4 +1,4 @@ -/* $OpenBSD: wds.c,v 1.35 2010/06/26 23:24:44 guenther Exp $ */ +/* $OpenBSD: wds.c,v 1.36 2010/06/28 18:31:02 krw Exp $ */ /* $NetBSD: wds.c,v 1.13 1996/11/03 16:20:31 mycroft Exp $ */ #undef WDSDIAG @@ -174,14 +174,6 @@ struct scsi_adapter wds_switch = { 0, }; -/* the below structure is so we have a default dev struct for our link struct */ -struct scsi_device wds_dev = { - NULL, /* Use default error handler */ - NULL, /* have a queue, served by this */ - NULL, /* have no async handler */ - NULL, /* Use default 'done' routine */ -}; - int wdsprobe(struct device *, void *, void *); void wdsattach(struct device *, struct device *, void *); @@ -312,7 +304,6 @@ wdsattach(parent, self, aux) sc->sc_link.adapter_softc = sc; sc->sc_link.adapter_target = sc->sc_scsi_dev; sc->sc_link.adapter = &wds_switch; - sc->sc_link.device = &wds_dev; /* XXX */ /* I don't think the -ASE can handle openings > 1. */ /* It gives Vendor Error 26 whenever I try it. */ diff --git a/sys/dev/pci/arc.c b/sys/dev/pci/arc.c index fef6b756d7b..e192f5b2b95 100644 --- a/sys/dev/pci/arc.c +++ b/sys/dev/pci/arc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: arc.c,v 1.84 2010/05/20 00:55:17 krw Exp $ */ +/* $OpenBSD: arc.c,v 1.85 2010/06/28 18:31:02 krw Exp $ */ /* * Copyright (c) 2006 David Gwynne <dlg@openbsd.org> @@ -405,10 +405,6 @@ struct scsi_adapter arc_switch = { arc_scsi_cmd, arc_minphys, NULL, NULL, NULL }; -struct scsi_device arc_dev = { - NULL, NULL, NULL, NULL -}; - /* code to deal with getting bits in and out of the bus space */ u_int32_t arc_read(struct arc_softc *, bus_size_t); void arc_read_region(struct arc_softc *, bus_size_t, @@ -595,7 +591,6 @@ arc_attach(struct device *parent, struct device *self, void *aux) if (sc->sc_shutdownhook == NULL) panic("unable to establish arc powerhook"); - sc->sc_link.device = &arc_dev; sc->sc_link.adapter = &arc_switch; sc->sc_link.adapter_softc = sc; sc->sc_link.adapter_target = ARC_MAX_TARGET; diff --git a/sys/dev/pci/ips.c b/sys/dev/pci/ips.c index 55257c7aa90..efd515c4f23 100644 --- a/sys/dev/pci/ips.c +++ b/sys/dev/pci/ips.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ips.c,v 1.98 2010/06/15 04:11:34 dlg Exp $ */ +/* $OpenBSD: ips.c,v 1.99 2010/06/28 18:31:02 krw Exp $ */ /* * Copyright (c) 2006, 2007, 2009 Alexander Yurchenko <grange@openbsd.org> @@ -504,13 +504,6 @@ static struct scsi_adapter ips_scsi_adapter = { ips_scsi_ioctl }; -static struct scsi_device ips_scsi_device = { - NULL, - NULL, - NULL, - NULL -}; - static struct scsi_adapter ips_scsi_pt_adapter = { ips_scsi_pt_cmd, scsi_minphys, @@ -519,13 +512,6 @@ static struct scsi_adapter ips_scsi_pt_adapter = { NULL }; -static struct scsi_device ips_scsi_pt_device = { - NULL, - NULL, - NULL, - NULL -}; - static const struct pci_matchid ips_ids[] = { { PCI_VENDOR_IBM, PCI_PRODUCT_IBM_SERVERAID }, { PCI_VENDOR_IBM, PCI_PRODUCT_IBM_SERVERAID2 }, @@ -743,7 +729,6 @@ ips_attach(struct device *parent, struct device *self, void *aux) sc->sc_scsi_link.openings = sc->sc_nccbs / sc->sc_nunits; sc->sc_scsi_link.adapter_target = sc->sc_nunits; sc->sc_scsi_link.adapter_buswidth = sc->sc_nunits; - sc->sc_scsi_link.device = &ips_scsi_device; sc->sc_scsi_link.adapter = &ips_scsi_adapter; sc->sc_scsi_link.adapter_softc = sc; @@ -787,7 +772,6 @@ ips_attach(struct device *parent, struct device *self, void *aux) link->openings = 1; link->adapter_target = IPS_MAXTARGETS; link->adapter_buswidth = lastarget + 1; - link->device = &ips_scsi_pt_device; link->adapter = &ips_scsi_pt_adapter; link->adapter_softc = pt; diff --git a/sys/dev/pci/mpii.c b/sys/dev/pci/mpii.c index 7f602bce094..92b287de1cb 100644 --- a/sys/dev/pci/mpii.c +++ b/sys/dev/pci/mpii.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mpii.c,v 1.23 2010/06/27 03:34:29 matthew Exp $ */ +/* $OpenBSD: mpii.c,v 1.24 2010/06/28 18:31:02 krw Exp $ */ /* * Copyright (c) 2010 Mike Belopuhov <mkb@crypt.org.ru> * Copyright (c) 2009 James Giannoules @@ -1872,13 +1872,6 @@ struct scsi_adapter mpii_switch = { mpii_scsi_ioctl }; -struct scsi_device mpii_dev = { - NULL, - NULL, - NULL, - NULL -}; - struct mpii_dmamem *mpii_dmamem_alloc(struct mpii_softc *, size_t); void mpii_dmamem_free(struct mpii_softc *, struct mpii_dmamem *); @@ -2139,7 +2132,7 @@ mpii_attach(struct device *parent, struct device *self, void *aux) } if (mpii_alloc_dev(sc) != 0) { - printf("%s: unable to allocate memory for mpii_dev\n", + printf("%s: unable to allocate memory for mpii_device\n", DEVNAME(sc)); goto free_queues; } @@ -2152,7 +2145,6 @@ mpii_attach(struct device *parent, struct device *self, void *aux) rw_init(&sc->sc_lock, "mpii_lock"); /* we should be good to go now, attach scsibus */ - sc->sc_link.device = &mpii_dev; sc->sc_link.adapter = &mpii_switch; sc->sc_link.adapter_softc = sc; sc->sc_link.adapter_target = -1; diff --git a/sys/dev/pci/pcscp.c b/sys/dev/pci/pcscp.c index f9c91ae85d7..fc496d92e6f 100644 --- a/sys/dev/pci/pcscp.c +++ b/sys/dev/pci/pcscp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pcscp.c,v 1.16 2009/02/16 21:19:07 miod Exp $ */ +/* $OpenBSD: pcscp.c,v 1.17 2010/06/28 18:31:02 krw Exp $ */ /* $NetBSD: pcscp.c,v 1.26 2003/10/19 10:25:42 tsutsui Exp $ */ /*- @@ -298,7 +298,7 @@ pcscp_attach(struct device *parent, struct device *self, void *aux) /* Do the common parts of attachment. */ printf("%s", sc->sc_dev.dv_xname); - ncr53c9x_attach(sc, &pcscp_adapter, NULL); + ncr53c9x_attach(sc, &pcscp_adapter); /* Turn on target selection using the `dma' method */ sc->sc_features |= NCR_F_DMASELECT; diff --git a/sys/dev/pci/qli_pci.c b/sys/dev/pci/qli_pci.c index a1a615f5aef..06252c1b04f 100644 --- a/sys/dev/pci/qli_pci.c +++ b/sys/dev/pci/qli_pci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: qli_pci.c,v 1.18 2010/05/20 00:55:18 krw Exp $ */ +/* $OpenBSD: qli_pci.c,v 1.19 2010/06/28 18:31:02 krw Exp $ */ /* * Copyright (c) 2007 Marco Peereboom <marco@peereboom.us> * Copyright (c) 2007 David Collins <dave@davec.name> @@ -167,10 +167,6 @@ struct scsi_adapter qli_switch = { qli_scsi_cmd, qliminphys, 0, 0, qli_scsi_ioctl }; -struct scsi_device qli_dev = { - NULL, NULL, NULL, NULL -}; - struct cfdriver qli_cd = { NULL, "qli", DV_DULL }; diff --git a/sys/dev/pcmcia/esp_pcmcia.c b/sys/dev/pcmcia/esp_pcmcia.c index 9717fdaf3a3..026b04a21fc 100644 --- a/sys/dev/pcmcia/esp_pcmcia.c +++ b/sys/dev/pcmcia/esp_pcmcia.c @@ -1,4 +1,4 @@ -/* $OpenBSD: esp_pcmcia.c,v 1.8 2009/02/16 21:19:07 miod Exp $ */ +/* $OpenBSD: esp_pcmcia.c,v 1.9 2010/06/28 18:31:02 krw Exp $ */ /* $NetBSD: esp_pcmcia.c,v 1.8 2000/06/05 15:36:45 tsutsui Exp $ */ /*- @@ -208,7 +208,7 @@ esp_pcmcia_attach(parent, self, aux) * Initialize nca board itself. */ esc->sc_flags |= ESP_PCMCIA_ATTACHING; - ncr53c9x_attach(sc, &esp_pcmcia_adapter, NULL); + ncr53c9x_attach(sc, &esp_pcmcia_adapter); esc->sc_flags &= ~ESP_PCMCIA_ATTACHING; esc->sc_flags |= ESP_PCMCIA_ATTACHED; return; diff --git a/sys/dev/sbus/esp_sbus.c b/sys/dev/sbus/esp_sbus.c index 3aa65efa19e..58852b43d3f 100644 --- a/sys/dev/sbus/esp_sbus.c +++ b/sys/dev/sbus/esp_sbus.c @@ -1,4 +1,4 @@ -/* $OpenBSD: esp_sbus.c,v 1.22 2009/02/16 21:19:07 miod Exp $ */ +/* $OpenBSD: esp_sbus.c,v 1.23 2010/06/28 18:31:02 krw Exp $ */ /* $NetBSD: esp_sbus.c,v 1.14 2001/04/25 17:53:37 bouyer Exp $ */ /*- @@ -61,13 +61,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 */ -}; - /* #define ESP_SBUS_DEBUG */ static int esp_unit_offset; @@ -514,7 +507,7 @@ espattach(struct esp_softc *esc, struct ncr53c9x_glue *gluep) sc->sc_features |= NCR_F_DMASELECT; /* Do the common parts of attachment. */ - ncr53c9x_attach(sc, &esp_switch, &esp_dev); + ncr53c9x_attach(sc, &esp_switch); } /* diff --git a/sys/dev/softraid.c b/sys/dev/softraid.c index 44ac757c6c0..ad03205b17a 100644 --- a/sys/dev/softraid.c +++ b/sys/dev/softraid.c @@ -1,4 +1,4 @@ -/* $OpenBSD: softraid.c,v 1.206 2010/06/15 10:59:52 dlg Exp $ */ +/* $OpenBSD: softraid.c,v 1.207 2010/06/28 18:31:01 krw Exp $ */ /* * Copyright (c) 2007, 2008, 2009 Marco Peereboom <marco@peereboom.us> * Copyright (c) 2008 Chris Kuethe <ckuethe@openbsd.org> @@ -169,10 +169,6 @@ struct scsi_adapter sr_switch = { sr_scsi_cmd, sr_minphys, NULL, NULL, sr_scsi_ioctl }; -struct scsi_device sr_dev = { - NULL, NULL, NULL, NULL -}; - /* native metadata format */ int sr_meta_native_bootprobe(struct sr_softc *, struct device *, struct sr_metadata_list_head *); @@ -2946,7 +2942,6 @@ sr_ioctl_createraid(struct sr_softc *sc, struct bioc_createraid *bc, int user) sd->sd_link.openings = sd->sd_openings(sd); else sd->sd_link.openings = sd->sd_max_wu; - sd->sd_link.device = &sr_dev; sd->sd_link.device_softc = sc; sd->sd_link.adapter_softc = sc; sd->sd_link.adapter = &sr_switch; diff --git a/sys/dev/tc/asc.c b/sys/dev/tc/asc.c index 6bf47cc5312..ead505bdf44 100644 --- a/sys/dev/tc/asc.c +++ b/sys/dev/tc/asc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: asc.c,v 1.24 2009/02/16 21:19:07 miod Exp $ */ +/* $OpenBSD: asc.c,v 1.25 2010/06/28 18:31:02 krw Exp $ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -77,13 +77,6 @@ struct scsi_adapter asc_switch = { NULL, }; -struct scsi_device asc_dev = { - NULL, /* Use default error handler */ - NULL, /* have a queue, served by this */ - NULL, /* have no async handler */ - NULL, /* Use default `done' routine */ -}; - /* * Glue functions */ diff --git a/sys/dev/tc/asc_tc.c b/sys/dev/tc/asc_tc.c index af9f0930dd6..caaee612c4e 100644 --- a/sys/dev/tc/asc_tc.c +++ b/sys/dev/tc/asc_tc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: asc_tc.c,v 1.9 2008/08/09 16:42:30 miod Exp $ */ +/* $OpenBSD: asc_tc.c,v 1.10 2010/06/28 18:31:02 krw Exp $ */ /* $NetBSD: asc_tc.c,v 1.19 2001/11/15 09:48:19 lukem Exp $ */ /*- @@ -62,7 +62,6 @@ struct cfattach asc_tc_ca = { }; extern struct scsi_adapter asc_switch; -extern struct scsi_device asc_dev; int asc_dma_isintr(struct ncr53c9x_softc *); void asc_tc_reset(struct ncr53c9x_softc *); @@ -180,7 +179,7 @@ asc_tc_attach(parent, self, aux) sc->sc_maxxfer = 64 * 1024; /* Do the common parts of attachment. */ - ncr53c9x_attach(sc, &asc_switch, &asc_dev); + ncr53c9x_attach(sc, &asc_switch); } void diff --git a/sys/dev/tc/asc_tcds.c b/sys/dev/tc/asc_tcds.c index 8ccd54528de..4d3f4d1522a 100644 --- a/sys/dev/tc/asc_tcds.c +++ b/sys/dev/tc/asc_tcds.c @@ -1,4 +1,4 @@ -/* $OpenBSD: asc_tcds.c,v 1.6 2008/08/09 16:42:30 miod Exp $ */ +/* $OpenBSD: asc_tcds.c,v 1.7 2010/06/28 18:31:02 krw Exp $ */ /* $NetBSD: asc_tcds.c,v 1.5 2001/11/15 09:48:19 lukem Exp $ */ /*- @@ -114,7 +114,6 @@ struct ncr53c9x_glue asc_tcds_glue = { }; extern struct scsi_adapter asc_switch; -extern struct scsi_device asc_dev; int asc_tcds_match(parent, cf, aux) @@ -211,7 +210,7 @@ asc_tcds_attach(parent, self, aux) sc->sc_maxxfer = 64 * 1024; /* Do the common parts of attachment. */ - ncr53c9x_attach(sc, &asc_switch, &asc_dev); + ncr53c9x_attach(sc, &asc_switch); } void diff --git a/sys/dev/usb/umass_scsi.c b/sys/dev/usb/umass_scsi.c index 66d59909f93..c24a9471d3c 100644 --- a/sys/dev/usb/umass_scsi.c +++ b/sys/dev/usb/umass_scsi.c @@ -1,4 +1,4 @@ -/* $OpenBSD: umass_scsi.c,v 1.29 2010/05/20 00:55:18 krw Exp $ */ +/* $OpenBSD: umass_scsi.c,v 1.30 2010/06/28 18:31:02 krw Exp $ */ /* $NetBSD: umass_scsipi.c,v 1.9 2003/02/16 23:14:08 augustss Exp $ */ /* * Copyright (c) 2001 The NetBSD Foundation, Inc. @@ -77,12 +77,6 @@ void umass_scsi_sense_cb(struct umass_softc *sc, void *priv, int residue, int status); struct umass_scsi_softc *umass_scsi_setup(struct umass_softc *); -struct scsi_device umass_scsi_dev = { NULL, NULL, NULL, NULL, }; - -#if NATAPISCSI > 0 -struct scsi_device umass_atapiscsi_dev = { NULL, NULL, NULL, NULL, }; -#endif - int umass_scsi_attach(struct umass_softc *sc) { @@ -94,7 +88,6 @@ umass_scsi_attach(struct umass_softc *sc) scbus->sc_link.luns = sc->maxlun + 1; scbus->sc_link.flags &= ~SDEV_ATAPI; scbus->sc_link.flags |= SDEV_UMASS; - scbus->sc_link.device = &umass_scsi_dev; bzero(&saa, sizeof(saa)); saa.saa_sc_link = &scbus->sc_link; @@ -124,7 +117,6 @@ umass_atapi_attach(struct umass_softc *sc) scbus->sc_link.luns = 1; scbus->sc_link.openings = 1; scbus->sc_link.flags |= SDEV_ATAPI; - scbus->sc_link.device = &umass_atapiscsi_dev; bzero(&saa, sizeof(saa)); saa.saa_sc_link = &scbus->sc_link; diff --git a/sys/dev/usb/usscanner.c b/sys/dev/usb/usscanner.c index 351c9a2fbd6..bc53b49aba6 100644 --- a/sys/dev/usb/usscanner.c +++ b/sys/dev/usb/usscanner.c @@ -1,4 +1,4 @@ -/* $OpenBSD: usscanner.c,v 1.32 2010/06/19 21:43:16 krw Exp $ */ +/* $OpenBSD: usscanner.c,v 1.33 2010/06/28 18:31:02 krw Exp $ */ /* $NetBSD: usscanner.c,v 1.6 2001/01/23 14:04:14 augustss Exp $ */ /* @@ -77,7 +77,6 @@ int usscannerdebug = 0; #define XS_CTL_DATA_OUT SCSI_DATA_OUT #define scsipi_adapter scsi_adapter #define scsipi_cmd scsi_cmd -#define scsipi_device scsi_device #define scsipi_done scsi_done #define scsipi_link scsi_link #define scsipi_minphys scsi_minphys @@ -99,14 +98,6 @@ int usscannerdebug = 0; #define USSCANNER_TIMEOUT 2000 -struct scsipi_device usscanner_dev = -{ - NULL, /* Use default error handler */ - NULL, /* have a queue, served by this */ - NULL, /* have no async handler */ - NULL, /* Use default 'done' routine */ -}; - struct usscanner_softc { struct device sc_dev; usbd_device_handle sc_udev; @@ -341,7 +332,6 @@ usscanner_attach(struct device *parent, struct device *self, void *aux) sc->sc_link.adapter_softc = sc; sc->sc_link.adapter = &sc->sc_adapter; - sc->sc_link.device = &usscanner_dev; sc->sc_link.openings = 1; bzero(&saa, sizeof(saa)); diff --git a/sys/dev/vscsi.c b/sys/dev/vscsi.c index 5ad1613b481..3e9c95acc08 100644 --- a/sys/dev/vscsi.c +++ b/sys/dev/vscsi.c @@ -1,4 +1,4 @@ -/* $OpenBSD: vscsi.c,v 1.13 2010/06/27 03:34:29 matthew Exp $ */ +/* $OpenBSD: vscsi.c,v 1.14 2010/06/28 18:31:01 krw Exp $ */ /* * Copyright (c) 2008 David Gwynne <dlg@openbsd.org> @@ -93,10 +93,6 @@ struct scsi_adapter vscsi_switch = { NULL }; -struct scsi_device vscsi_dev = { - NULL, NULL, NULL, NULL -}; - void vscsi_xs_stuffup(struct scsi_xfer *); @@ -135,7 +131,6 @@ vscsi_attach(struct device *parent, struct device *self, void *aux) rw_init(&sc->sc_open, DEVNAME(sc)); rw_init(&sc->sc_ccb_polling, DEVNAME(sc)); - sc->sc_link.device = &vscsi_dev; sc->sc_link.adapter = &vscsi_switch; sc->sc_link.adapter_softc = sc; sc->sc_link.adapter_target = 256; diff --git a/sys/scsi/mpath.c b/sys/scsi/mpath.c index bdd9eb9d5a7..b6968beb068 100644 --- a/sys/scsi/mpath.c +++ b/sys/scsi/mpath.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mpath.c,v 1.15 2010/06/27 03:34:29 matthew Exp $ */ +/* $OpenBSD: mpath.c,v 1.16 2010/06/28 18:31:02 krw Exp $ */ /* * Copyright (c) 2009 David Gwynne <dlg@openbsd.org> @@ -87,10 +87,6 @@ struct scsi_adapter mpath_switch = { NULL }; -struct scsi_device mpath_dev = { - NULL, NULL, NULL, NULL -}; - void mpath_xs_stuffup(struct scsi_xfer *); int @@ -109,7 +105,6 @@ mpath_attach(struct device *parent, struct device *self, void *aux) printf("\n"); - sc->sc_link.device = &mpath_dev; sc->sc_link.adapter = &mpath_switch; sc->sc_link.adapter_softc = sc; sc->sc_link.adapter_target = MPATH_BUSWIDTH; |