diff options
| author | Brad Smith <brad@cvs.openbsd.org> | 2013-06-08 17:07:32 +0000 |
|---|---|---|
| committer | Brad Smith <brad@cvs.openbsd.org> | 2013-06-08 17:07:32 +0000 |
| commit | 6f5d7d986a8441a86a60a6ff989d87fb8b2bc337 (patch) | |
| tree | 27e484f22e197a89215c766bcb6bcb1ca3f2123b | |
| parent | 145d20d3089f385b19118cccc36b5bd809d49094 (diff) | |
Remove redundant code setting PCI_COMMAND_MASTER_ENABLE as this is already
taken care of by pci_mapreg_map().
Ok yasuoka@ uebayasi@
| -rw-r--r-- | sys/dev/pci/if_vmx.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/sys/dev/pci/if_vmx.c b/sys/dev/pci/if_vmx.c index 0ef054b9e57..793a54c1ee7 100644 --- a/sys/dev/pci/if_vmx.c +++ b/sys/dev/pci/if_vmx.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_vmx.c,v 1.4 2013/06/05 02:04:07 dlg Exp $ */ +/* $OpenBSD: if_vmx.c,v 1.5 2013/06/08 17:07:31 brad Exp $ */ /* * Copyright (c) 2013 Tsubai Masanari @@ -198,13 +198,9 @@ vmxnet3_attach(struct device *parent, struct device *self, void *aux) struct ifnet *ifp = &sc->sc_arpcom.ac_if; pci_intr_handle_t ih; const char *intrstr; - u_int csr, memtype, ver, macl, mach; + u_int memtype, ver, macl, mach; u_char enaddr[ETHER_ADDR_LEN]; - csr = pci_conf_read(pa->pa_pc, pa->pa_tag, PCI_COMMAND_STATUS_REG); - csr |= PCI_COMMAND_MASTER_ENABLE; - pci_conf_write(pa->pa_pc, pa->pa_tag, PCI_COMMAND_STATUS_REG, csr); - memtype = pci_mapreg_type(pa->pa_pc, pa->pa_tag, 0x10); if (pci_mapreg_map(pa, 0x10, memtype, 0, &sc->sc_iot0, &sc->sc_ioh0, NULL, NULL, 0)) { |