diff --git a/sys/dev/mly/mly.c b/sys/dev/mly/mly.c index 074d6fa20176..f00c147dd446 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 e1c7a50e9167..62e674c73634 100644 --- a/sys/dev/mly/mlyvar.h +++ b/sys/dev/mly/mlyvar.h @@ -57,15 +57,7 @@ ******************************************************************************** ********************************************************************************/ -#if __FreeBSD_version >= 500005 # include -#endif - -#if __FreeBSD_version <= 500014 -# include -# 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 */ };