svn commit: r314729 - stable/10/sys/dev/isp

[Alexander Motin]

Author: mav
Date: Mon Mar  6 06:20:14 2017
New Revision: 314729
URL: https://svnweb.freebsd.org/changeset/base/314729

Log:
  MFC r314038: Remove ancient __FreeBSD_version checks.

Modified:
  stable/10/sys/dev/isp/isp_freebsd.c
  stable/10/sys/dev/isp/isp_freebsd.h
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/dev/isp/isp_freebsd.c
==============================================================================
--- stable/10/sys/dev/isp/isp_freebsd.c	Mon Mar  6 06:19:42 2017	(r314728)
+++ stable/10/sys/dev/isp/isp_freebsd.c	Mon Mar  6 06:20:14 2017	(r314729)
@@ -41,12 +41,6 @@ __FBSDID("$FreeBSD$");
 #include <cam/cam_periph.h>
 #include <cam/cam_xpt_periph.h>
 
-#if	__FreeBSD_version < 800002 
-#define	THREAD_CREATE	kthread_create
-#else
-#define	THREAD_CREATE	kproc_create
-#endif
-
 MODULE_VERSION(isp, 1);
 MODULE_DEPEND(isp, cam, 1, 1, 1);
 int isp_announced = 0;
@@ -176,7 +170,8 @@ isp_attach_chan(ispsoftc_t *isp, struct 
 #endif
 		isp_loop_changed(isp, chan);
 		ISP_UNLOCK(isp);
-		if (THREAD_CREATE(isp_kthread, fc, &fc->kproc, 0, 0, "%s: fc_thrd%d", device_get_nameunit(isp->isp_osinfo.dev), chan)) {
+		if (kproc_create(isp_kthread, fc, &fc->kproc, 0, 0,
+		    "%s_%d", device_get_nameunit(isp->isp_osinfo.dev), chan)) {
 			xpt_free_path(fc->path);
 			ISP_LOCK(isp);
 			xpt_bus_deregister(cam_sim_path(fc->sim));

Modified: stable/10/sys/dev/isp/isp_freebsd.h
==============================================================================
--- stable/10/sys/dev/isp/isp_freebsd.h	Mon Mar  6 06:19:42 2017	(r314728)
+++ stable/10/sys/dev/isp/isp_freebsd.h	Mon Mar  6 06:20:14 2017	(r314729)
@@ -88,14 +88,6 @@ isp_ecmd_t *	isp_get_ecmd(struct ispsoft
 void		isp_put_ecmd(struct ispsoftc *, isp_ecmd_t *);
 
 #ifdef	ISP_TARGET_MODE
-/* Not quite right, but there was no bump for this change */
-#if __FreeBSD_version < 225469
-#define	SDFIXED(x)	(&x)
-#else
-#define	SDFIXED(x)	((struct scsi_sense_data_fixed *)(&x))
-#endif
-
-#define	ISP_TARGET_FUNCTIONS	1
 #define	ATPDPSIZE	4096
 #define	ATPDPHASHSIZE	32
 #define	ATPDPHASH(x)	((((x) >> 24) ^ ((x) >> 16) ^ ((x) >> 8) ^ (x)) &  \