Date: Wed, 19 Mar 2014 22:50:15 +0000 (UTC) From: Dimitry Andric <dim@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r263384 - in stable: 10/sys/dev/isp 9/sys/dev/isp Message-ID: <201403192250.s2JMoFNS079261@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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/10/sys/dev/isp/isp.c stable/10/sys/dev/isp/isp_freebsd.c Directory Properties: stable/10/ (props changed) Changes in other areas also in this revision: Modified: stable/9/sys/dev/isp/isp.c stable/9/sys/dev/isp/isp_freebsd.c Directory Properties: stable/9/sys/ (props changed) Modified: stable/10/sys/dev/isp/isp.c ============================================================================== --- stable/10/sys/dev/isp/isp.c Wed Mar 19 22:27:10 2014 (r263383) +++ stable/10/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/10/sys/dev/isp/isp_freebsd.c ============================================================================== --- stable/10/sys/dev/isp/isp_freebsd.c Wed Mar 19 22:27:10 2014 (r263383) +++ stable/10/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; @@ -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; }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201403192250.s2JMoFNS079261>