svn commit: r276754 - head/sys/dev/ciss

[John Baldwin]

Author: jhb
Date: Tue Jan  6 15:48:20 2015
New Revision: 276754
URL: https://svnweb.freebsd.org/changeset/base/276754

Log:
  Remove compat shims for FreeBSD versions older than 6 (really early 5).
  The only diffs in the disassembly were different line numbers passed to
  lock functions.

Modified:
  head/sys/dev/ciss/ciss.c
  head/sys/dev/ciss/cissvar.h

Modified: head/sys/dev/ciss/ciss.c
==============================================================================
--- head/sys/dev/ciss/ciss.c	Tue Jan  6 15:41:23 2015	(r276753)
+++ head/sys/dev/ciss/ciss.c	Tue Jan  6 15:48:20 2015	(r276754)
@@ -4164,9 +4164,7 @@ ciss_notify_thread(void *arg)
     struct ciss_notify		*cn;
 
     sc = (struct ciss_softc *)arg;
-#if __FreeBSD_version >= 500000
     mtx_lock(&sc->ciss_mtx);
-#endif
 
     for (;;) {
 	if (STAILQ_EMPTY(&sc->ciss_notify) != 0 &&
@@ -4201,9 +4199,7 @@ ciss_notify_thread(void *arg)
     sc->ciss_notify_thread = NULL;
     wakeup(&sc->ciss_notify_thread);
 
-#if __FreeBSD_version >= 500000
     mtx_unlock(&sc->ciss_mtx);
-#endif
     kproc_exit(0);
 }
 
@@ -4214,15 +4210,9 @@ static void
 ciss_spawn_notify_thread(struct ciss_softc *sc)
 {
 
-#if __FreeBSD_version > 500005
     if (kproc_create((void(*)(void *))ciss_notify_thread, sc,
 		       &sc->ciss_notify_thread, 0, 0, "ciss_notify%d",
 		       device_get_unit(sc->ciss_dev)))
-#else
-    if (kproc_create((void(*)(void *))ciss_notify_thread, sc,
-		       &sc->ciss_notify_thread, "ciss_notify%d",
-		       device_get_unit(sc->ciss_dev)))
-#endif
 	panic("Could not create notify thread\n");
 }
 

Modified: head/sys/dev/ciss/cissvar.h
==============================================================================
--- head/sys/dev/ciss/cissvar.h	Tue Jan  6 15:41:23 2015	(r276753)
+++ head/sys/dev/ciss/cissvar.h	Tue Jan  6 15:48:20 2015	(r276754)
@@ -77,14 +77,6 @@ typedef STAILQ_HEAD(, ciss_request)	cr_q
 #define CISS_HEARTBEAT_RATE		10
 
 /************************************************************************
- * Compatibility with older versions of FreeBSD
- */
-#if __FreeBSD_version < 440001
-#warning testing old-FreeBSD compat
-typedef struct proc	d_thread_t;
-#endif
-
-/************************************************************************
  * Driver version.  Only really significant to the ACU interface.
  */
 #define CISS_DRIVER_VERSION	20011201