From c3167cabe6ab0e5951bdeb1092d2dc96f5ea2545 Mon Sep 17 00:00:00 2001 From: Matt Jacob Date: Wed, 25 Dec 2013 04:51:56 +0000 Subject: [PATCH] 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 --- sys/dev/isp/isp.c | 1 - sys/dev/isp/isp_freebsd.c | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/sys/dev/isp/isp.c b/sys/dev/isp/isp.c index 32ee10a80962..8ac6bf2152f5 100644 --- a/sys/dev/isp/isp.c +++ b/sys/dev/isp/isp.c @@ -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"; diff --git a/sys/dev/isp/isp_freebsd.c b/sys/dev/isp/isp_freebsd.c index 1665c4147e3e..605c688f0530 100644 --- a/sys/dev/isp/isp_freebsd.c +++ b/sys/dev/isp/isp_freebsd.c @@ -56,7 +56,6 @@ int isp_quickboot_time = 7; /* don't wait more than N secs for loop up */ 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; }