Author: mjacob
Date: Wed Dec 25 04:51:56 2013
New Revision: 259860
URL: http://svnweb.freebsd.org/changeset/base/259860

Log:
  Harvest one no longer used constant string.
  
  Remove another and place it into play in the
  normally ifdef protected zone it would be used
  int.
  
  Noticed by:   dim

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

Modified: head/sys/dev/isp/isp.c
==============================================================================
--- head/sys/dev/isp/isp.c      Wed Dec 25 03:24:20 2013        (r259859)
+++ head/sys/dev/isp/isp.c      Wed Dec 25 04:51:56 2013        (r259860)
@@ -75,7 +75,6 @@ __FBSDID("$FreeBSD$");
 static const char fconf[] = "Chan %d PortDB[%d] changed:\n current 
=(0x%x@0x%06x 0x%08x%08x 0x%08x%08x)\n database=(0x%x@0x%06x 0x%08x%08x 
0x%08x%08x)";
 static const char notresp[] = "Not RESPONSE in RESPONSE Queue (type 0x%x) @ 
idx %d (next %d) nlooked %d";
 static const char topology[] = "Chan %d WWPN 0x%08x%08x PortID 0x%06x N-Port 
Handle %d, Connection '%s'";
-static const char sc4[] = "NVRAM";
 static const char bun[] = "bad underrun (count %d, resid %d, status %s)";
 static const char lipd[] = "Chan %d LIP destroyed %d active commands";
 static const char sacq[] = "unable to acquire scratch area";

Modified: head/sys/dev/isp/isp_freebsd.c
==============================================================================
--- head/sys/dev/isp/isp_freebsd.c      Wed Dec 25 03:24:20 2013        
(r259859)
+++ head/sys/dev/isp/isp_freebsd.c      Wed Dec 25 04:51:56 2013        
(r259860)
@@ -56,7 +56,6 @@ int isp_quickboot_time = 7;   /* don't wai
 int isp_gone_device_time = 30; /* grace time before reporting device lost */
 int isp_autoconfig = 1;                /* automatically attach/detach devices 
*/
 static const char prom3[] = "Chan %d PortID 0x%06x Departed from Target %u 
because of %s";
-static const char rqo[] = "%s: Request Queue Overflow\n";
 
 static void isp_freeze_loopdown(ispsoftc_t *, int, char *);
 static d_ioctl_t ispioctl;
@@ -2152,7 +2151,8 @@ isp_target_putback_atio(union ccb *ccb)
 
        qe = isp_getrqentry(isp);
        if (qe == NULL) {
-               xpt_print(ccb->ccb_h.path, rqo, __func__);
+               xpt_print(ccb->ccb_h.path,
+                   "%s: Request Queue Overflow\n", __func__);
                (void) timeout(isp_refire_putback_atio, ccb, 10);
                return;
        }
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Reply via email to