Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/dev/pci remove dev code included in previous commit by m...



details:   https://anonhg.NetBSD.org/src/rev/19e266218102
branches:  trunk
changeset: 817974:19e266218102
user:      jdolecek <jdolecek%NetBSD.org@localhost>
date:      Sat Sep 17 20:15:09 2016 +0000

description:
remove dev code included in previous commit by mistake

diffstat:

 sys/dev/pci/nvme_pci.c |  15 +++------------
 1 files changed, 3 insertions(+), 12 deletions(-)

diffs (45 lines):

diff -r d50c72d7a398 -r 19e266218102 sys/dev/pci/nvme_pci.c
--- a/sys/dev/pci/nvme_pci.c    Sat Sep 17 20:12:53 2016 +0000
+++ b/sys/dev/pci/nvme_pci.c    Sat Sep 17 20:15:09 2016 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: nvme_pci.c,v 1.11 2016/09/17 20:12:53 jdolecek Exp $   */
+/*     $NetBSD: nvme_pci.c,v 1.12 2016/09/17 20:15:09 jdolecek Exp $   */
 /*     $OpenBSD: nvme_pci.c,v 1.3 2016/04/14 11:18:32 dlg Exp $ */
 
 /*
@@ -43,7 +43,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nvme_pci.c,v 1.11 2016/09/17 20:12:53 jdolecek Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nvme_pci.c,v 1.12 2016/09/17 20:15:09 jdolecek Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -192,16 +192,9 @@
                goto intr_release;
        }
 
-       sc->sc_softih = kmem_zalloc(sizeof(*sc->sc_softih) * psc->psc_nintrs,
-           KM_SLEEP);
-       if (sc->sc_softih == NULL) {
-               aprint_error_dev(self, "unable to allocate softih memory\n");
-               goto intr_free;
-       }
-
        if (nvme_attach(sc) != 0) {
                /* error printed by nvme_attach() */
-               goto softintr_free;
+               goto intr_free;
        }
 
        if (!pmf_device_register(self, NULL, NULL))
@@ -210,8 +203,6 @@
        SET(sc->sc_flags, NVME_F_ATTACHED);
        return;
 
-softintr_free:
-       kmem_free(sc->sc_softih, sizeof(*sc->sc_softih) * psc->psc_nintrs);
 intr_free:
        kmem_free(sc->sc_ih, sizeof(*sc->sc_ih) * psc->psc_nintrs);
        sc->sc_nq = 0;



Home | Main Index | Thread Index | Old Index