summaryrefslogtreecommitdiff
path: root/sys/dev/pci/mpii.c
diff options
context:
space:
mode:
authorKenneth R Westerback <krw@cvs.openbsd.org>2010-06-28 18:31:03 +0000
committerKenneth R Westerback <krw@cvs.openbsd.org>2010-06-28 18:31:03 +0000
commit32d204697861b907520e94f82e392d3e7d6d661a (patch)
tree7bad5a228621b81780b7712982b6a979ce2df424 /sys/dev/pci/mpii.c
parent12135c2c16aaab7651a7b1c48ed35586452fadcc (diff)
Remove all adapter-specific 'struct scsi_device's. They are never used. First
step in elminating 'struct scsi_device' entirely. Spotted and initial diff from matthew@. ok matthew@ dlg@ deraadt@ marco@ miod@
Diffstat (limited to 'sys/dev/pci/mpii.c')
-rw-r--r--sys/dev/pci/mpii.c12
1 files changed, 2 insertions, 10 deletions
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;