From 98f63133a9867a23f4caf0e10d4e921008fbefc4 Mon Sep 17 00:00:00 2001
From: scottl <scottl@FreeBSD.org>
Date: Mon, 8 Aug 2005 12:23:27 +0000
Subject: Retire the last of the FreeBSD 4.x compat code from the mly driver.

---
 sys/dev/mly/mly.c    |  4 ----
 sys/dev/mly/mlyvar.h | 12 +-----------
 2 files changed, 1 insertion(+), 15 deletions(-)

diff --git a/sys/dev/mly/mly.c b/sys/dev/mly/mly.c
index 074d6fa..f00c147 100644
--- a/sys/dev/mly/mly.c
+++ b/sys/dev/mly/mly.c
@@ -234,12 +234,10 @@ mly_attach(device_t dev)
     mly_initq_busy(sc);
     mly_initq_complete(sc);
 
-#if __FreeBSD_version >= 500005
     /*
      * Initialise command-completion task.
      */
     TASK_INIT(&sc->mly_task_complete, 0, mly_complete, sc);
-#endif
 
     /* disable interrupts before we start talking to the controller */
     MLY_MASK_INTERRUPTS(sc);
@@ -1605,11 +1603,9 @@ mly_done(struct mly_softc *sc)
 
     splx(s);
     if (worked) {
-#if __FreeBSD_version >= 500005
 	if (sc->mly_state & MLY_STATE_INTERRUPTS_ON)
 	    taskqueue_enqueue(taskqueue_swi_giant, &sc->mly_task_complete);
 	else
-#endif
 	    mly_complete(sc, 0);
     }
 }
diff --git a/sys/dev/mly/mlyvar.h b/sys/dev/mly/mlyvar.h
index e1c7a50..62e674c 100644
--- a/sys/dev/mly/mlyvar.h
+++ b/sys/dev/mly/mlyvar.h
@@ -57,15 +57,7 @@
  ********************************************************************************
  ********************************************************************************/
 
-#if __FreeBSD_version >= 500005
 # include <sys/taskqueue.h>
-#endif
-
-#if __FreeBSD_version <= 500014
-# include <machine/clock.h>
-# undef offsetof
-# define offsetof(type, field) ((size_t)(&((type *)0)->field))
-#endif
 
 #ifndef INTR_ENTROPY
 # define INTR_ENTROPY 0
@@ -234,10 +226,8 @@ struct mly_softc {
     struct cam_path		*mly_cam_path;			/* rescan path */
     int				mly_cam_channels;		/* total channel count */
 
-#if __FreeBSD_version >= 500005
     /* command-completion task */
-    struct task		mly_task_complete;	/* deferred-completion task */
-#endif
+    struct task			mly_task_complete;	/* deferred-completion task */
     int				mly_qfrzn_cnt;		/* Track simq freezes */
 };
 
-- 
cgit v1.1