diff options
| author | David Gwynne <dlg@cvs.openbsd.org> | 2012-08-14 03:46:47 +0000 |
|---|---|---|
| committer | David Gwynne <dlg@cvs.openbsd.org> | 2012-08-14 03:46:47 +0000 |
| commit | d1a7be171191e4f8d64f69f2dad8b77ef6e5c58f (patch) | |
| tree | 64ba1886007408659e0084fe2dedc3b9769d071f | |
| parent | 9ecac0cf1deda9157417b5b98be5aa08d87df5cd (diff) | |
gc sc_flags now that the iop struct can tell us where the different IDBs
are.
noted by haesbaert@
| -rw-r--r-- | sys/dev/ic/mfivar.h | 3 | ||||
| -rw-r--r-- | sys/dev/pci/mfi_pci.c | 4 |
2 files changed, 2 insertions, 5 deletions
diff --git a/sys/dev/ic/mfivar.h b/sys/dev/ic/mfivar.h index df4da29eac1..adc4f7a013b 100644 --- a/sys/dev/ic/mfivar.h +++ b/sys/dev/ic/mfivar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: mfivar.h,v 1.45 2012/08/14 03:44:11 dlg Exp $ */ +/* $OpenBSD: mfivar.h,v 1.46 2012/08/14 03:46:46 dlg Exp $ */ /* * Copyright (c) 2006 Marco Peereboom <marco@peereboom.us> * @@ -117,7 +117,6 @@ struct mfi_softc { const struct mfi_iop_ops *sc_iop; int sc_64bit_dma; - int sc_flags; bus_space_tag_t sc_iot; bus_space_handle_t sc_ioh; diff --git a/sys/dev/pci/mfi_pci.c b/sys/dev/pci/mfi_pci.c index d30f731af6e..ac3bcd6cfcb 100644 --- a/sys/dev/pci/mfi_pci.c +++ b/sys/dev/pci/mfi_pci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mfi_pci.c,v 1.26 2012/01/12 06:12:30 dlg Exp $ */ +/* $OpenBSD: mfi_pci.c,v 1.27 2012/08/14 03:46:46 dlg Exp $ */ /* * Copyright (c) 2006 Marco Peereboom <marco@peereboom.us> * @@ -155,8 +155,6 @@ mfi_pci_attach(struct device *parent, struct device *self, void *aux) return; } - sc->sc_flags = mpd->mpd_iop; - if (mpd->mpd_iop == MFI_IOP_GEN2 || mpd->mpd_iop == MFI_IOP_SKINNY) regbar = MFI_BAR_GEN2; else |