Author: dim
Date: Wed Mar 19 22:50:14 2014
New Revision: 263384
URL: http://svnweb.freebsd.org/changeset/base/263384
Log:
MFC r259860 (by mjacob):
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:
stable/9/sys/dev/isp/isp.c
stable/9/sys/dev/isp/isp_freebsd.c
Directory Properties:
stable/9/sys/ (props changed)
Changes in other areas also in this revision:
Modified:
stable/10/sys/dev/isp/isp.c
stable/10/sys/dev/isp/isp_freebsd.c
Directory Properties:
stable/10/ (props changed)
Modified: stable/9/sys/dev/isp/isp.c
==============================================================================
--- stable/9/sys/dev/isp/isp.c Wed Mar 19 22:27:10 2014 (r263383)
+++ stable/9/sys/dev/isp/isp.c Wed Mar 19 22:50:14 2014 (r263384)
@@ -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: stable/9/sys/dev/isp/isp_freebsd.c
==============================================================================
--- stable/9/sys/dev/isp/isp_freebsd.c Wed Mar 19 22:27:10 2014
(r263383)
+++ stable/9/sys/dev/isp/isp_freebsd.c Wed Mar 19 22:50:14 2014
(r263384)
@@ -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;
@@ -2146,7 +2145,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-stable-9@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9
To unsubscribe, send any mail to "svn-src-stable-9-unsubscr...@freebsd.org"
