Skip site navigation (1)Skip section navigation (2) 
Date:      Sun, 19 Mar 2017 21:25:13 +0000 (UTC)
From:      Alexander Motin <mav@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r315587 - head/sys/dev/isp
Message-ID:  <201703192125.v2JLPDPN038667@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: mav
Date: Sun Mar 19 21:25:13 2017
New Revision: 315587
URL: https://svnweb.freebsd.org/changeset/base/315587

Log:
  Remove some useless code.
  
  MFC after:	2 weeks

Modified:
  head/sys/dev/isp/isp.c
  head/sys/dev/isp/isp_freebsd.c
  head/sys/dev/isp/ispvar.h

Modified: head/sys/dev/isp/isp.c
==============================================================================
--- head/sys/dev/isp/isp.c	Sun Mar 19 21:24:07 2017	(r315586)
+++ head/sys/dev/isp/isp.c	Sun Mar 19 21:25:13 2017	(r315587)
@@ -4530,7 +4530,6 @@ isp_start(XS_T *xs)
 		return (dmaresult);
 	}
 	isp_xs_prt(isp, xs, ISP_LOGDEBUG0, "START cmd cdb[0]=0x%x datalen %ld", XS_CDBP(xs)[0], (long) XS_XFRLEN(xs));
-	isp->isp_nactive++;
 	return (CMD_QUEUED);
 }
 
@@ -5359,9 +5358,6 @@ isp_intr_respq(ispsoftc_t *isp)
 		}
 		isp_destroy_handle(isp, sp->req_handle);
 
-		if (isp->isp_nactive > 0) {
-		    isp->isp_nactive--;
-		}
 		complist[ndone++] = xs;	/* defer completion call until later */
 		ISP_MEMZERO(hp, QENTRY_LEN);	/* PERF */
 		last_etype = etype;
@@ -5932,9 +5928,6 @@ isp_handle_other_response(ispsoftc_t *is
 	void *ptr;
 
 	switch (type) {
-	case RQSTYPE_STATUS_CONT:
-		isp_prt(isp, ISP_LOG_WARN1, "Ignored Continuation Response");
-		return (1);
 	case RQSTYPE_MARKER:
 		isp_prt(isp, ISP_LOG_WARN1, "Marker Response");
 		return (1);
@@ -6536,9 +6529,6 @@ isp_fastpost_complete(ispsoftc_t *isp, u
 	if (XS_XFRLEN(xs)) {
 		ISP_DMAFREE(isp, xs, fph);
 	}
-	if (isp->isp_nactive) {
-		isp->isp_nactive--;
-	}
 	isp_done(xs);
 }
 
@@ -7579,7 +7569,6 @@ isp_reinit(ispsoftc_t *isp, int do_load_
 	}
 
 cleanup:
-	isp->isp_nactive = 0;
 	isp_clear_commands(isp);
 	if (IS_FC(isp)) {
 		for (i = 0; i < isp->isp_nchan; i++)

Modified: head/sys/dev/isp/isp_freebsd.c
==============================================================================
--- head/sys/dev/isp/isp_freebsd.c	Sun Mar 19 21:24:07 2017	(r315586)
+++ head/sys/dev/isp/isp_freebsd.c	Sun Mar 19 21:25:13 2017	(r315587)
@@ -1591,7 +1591,6 @@ isp_target_start_ctio(ispsoftc_t *isp, u
 			xpt_done(ccb);
 			continue;
 		}
-		isp->isp_nactive++;
 		ccb->ccb_h.status = CAM_REQ_INPROG | CAM_SIM_QUEUED;
 		if (xfrlen) {
 			ccb->ccb_h.spriv_field0 = atp->bytes_xfered;
@@ -2113,9 +2112,6 @@ isp_handle_platform_ctio(ispsoftc_t *isp
 	isp_destroy_handle(isp, handle);
 	resid = data_requested = PISP_PCMD(ccb)->datalen;
 	isp_free_pcmd(isp, ccb);
-	if (isp->isp_nactive) {
-		isp->isp_nactive--;
-	}
 
 	bus = XS_CHANNEL(ccb);
 	if (IS_24XX(isp)) {

Modified: head/sys/dev/isp/ispvar.h
==============================================================================
--- head/sys/dev/isp/ispvar.h	Sun Mar 19 21:24:07 2017	(r315586)
+++ head/sys/dev/isp/ispvar.h	Sun Mar 19 21:25:13 2017	(r315587)
@@ -553,7 +553,6 @@ struct ispsoftc {
 
 	volatile u_int		isp_mboxbsy;	/* mailbox command active */
 	volatile u_int		isp_state;
-	volatile u_int		isp_nactive;	/* how many commands active */
 	volatile mbreg_t	isp_curmbx;	/* currently active mailbox command */
 	volatile uint32_t	isp_reqodx;	/* index of last ISP pickup */
 	volatile uint32_t	isp_reqidx;	/* index of next request */

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201703192125.v2JLPDPN038667>