[src/prg-localcount2]: src/sys/dev/mscp Fix previous, make it build again.

[pgoyette <pgoyette%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/5652d6b656dd
branches:  prg-localcount2
changeset: 823557:5652d6b656dd
user:      pgoyette <pgoyette%NetBSD.org@localhost>
date:      Thu May 18 07:35:01 2017 +0000

description:
Fix previous, make it build again.

diffstat:

 sys/dev/mscp/mscp_disk.c |  19 +++++++------------
 1 files changed, 7 insertions(+), 12 deletions(-)

diffs (60 lines):

diff -r 8e21b367a3bb -r 5652d6b656dd sys/dev/mscp/mscp_disk.c
--- a/sys/dev/mscp/mscp_disk.c  Wed May 17 05:31:08 2017 +0000
+++ b/sys/dev/mscp/mscp_disk.c  Thu May 18 07:35:01 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: mscp_disk.c,v 1.89.8.4 2017/05/17 04:29:46 pgoyette Exp $      */
+/*     $NetBSD: mscp_disk.c,v 1.89.8.5 2017/05/18 07:35:01 pgoyette Exp $      */
 /*
  * Copyright (c) 1988 Regents of the University of California.
  * All rights reserved.
@@ -82,7 +82,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mscp_disk.c,v 1.89.8.4 2017/05/17 04:29:46 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mscp_disk.c,v 1.89.8.5 2017/05/18 07:35:01 pgoyette Exp $");
 
 #include <sys/param.h>
 #include <sys/buf.h>
@@ -289,7 +289,9 @@
        error = 0;
  bad1:
        mutex_exit(&ra->ra_disk.dk_openlock);
+#if notyet
  bad2:
+#endif
        device_release(ra->ra_dev);
        return (error);
 }
@@ -1184,7 +1186,7 @@
 static inline struct ra_softc *
 mscp_device_lookup(dev_t dev)
 {
-       const struct dev_cdevsw;
+       const struct cdevsw *dev_cdevsw;
        struct ra_softc *ra;
        int unit;
 
@@ -1207,20 +1209,13 @@
                cdevsw_release(dev_cdevsw);
 #endif
 #if NRX
-       if ((dev_cdevsw = cdevsw_lookup_acquire(dev)) == &rx_cdevsw)
+       if ((dev_cdevsw = cdevsw_lookup_acquire(dev)) == &rx_cdevsw) {
                ra = device_lookup_private_acquire(&rx_cd, unit);
                cdevsw_release(dev_cdevsw);
                return ra;
-       else
+       } else
                cdevsw_release(dev_cdevsw);
 #endif
        panic("mscp_device_lookup: unexpected major %"PRIu32" unit %u",
            major(dev), unit);
 }
-
-static void
-mscp_devsw_release(struct ra_softc *sc)
-{
-
-       device_release(sc->ra_dev);
-}