From mboxrd@z Thu Jan 1 00:00:00 1970 From: Harvey Harrison Subject: [PATCH 02/12] scsi: use the common hex_asc array rather than a private one Date: Mon, 12 May 2008 12:05:35 -0700 Message-ID: <1210619135.24092.53.camel@brick> Mime-Version: 1.0 Content-Type: text/plain Content-Transfer-Encoding: 7bit Return-path: Received: from wf-out-1314.google.com ([209.85.200.171]:42516 "EHLO wf-out-1314.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756596AbYELTFh (ORCPT ); Mon, 12 May 2008 15:05:37 -0400 Received: by wf-out-1314.google.com with SMTP id 27so2409757wfd.4 for ; Mon, 12 May 2008 12:05:37 -0700 (PDT) Sender: linux-scsi-owner@vger.kernel.org List-Id: linux-scsi@vger.kernel.org To: Andrew Morton Cc: LKML , linux-scsi , James Bottomley Also use the hi/lo helpers. Signed-off-by: Harvey Harrison --- drivers/scsi/ibmmca.c | 3 +-- drivers/scsi/ultrastor.c | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/drivers/scsi/ibmmca.c b/drivers/scsi/ibmmca.c index 4d15a62..6765a05 100644 --- a/drivers/scsi/ibmmca.c +++ b/drivers/scsi/ibmmca.c @@ -1002,12 +1002,11 @@ static char *ti_p(int dev) /* interpreter for logical device numbers (ldn) */ static char *ti_l(int val) { - const char hex[16] = "0123456789abcdef"; static char answer[2]; answer[1] = (char) (0x0); if (val <= MAX_LOG_DEV) - answer[0] = hex[val]; + answer[0] = hex_asc[val]; else answer[0] = '-'; return (char *) &answer; diff --git a/drivers/scsi/ultrastor.c b/drivers/scsi/ultrastor.c index 27aa40f..25828ce 100644 --- a/drivers/scsi/ultrastor.c +++ b/drivers/scsi/ultrastor.c @@ -876,8 +876,8 @@ static int ultrastor_abort(struct scsi_cmnd *SCpnt) for (i = 0; i < 16; i++) { unsigned char p = inb(port0 + i); - out[28 + i * 3] = "0123456789abcdef"[p >> 4]; - out[29 + i * 3] = "0123456789abcdef"[p & 15]; + out[28 + i * 3] = hex_asc_hi(p); + out[29 + i * 3] = hex_asc_lo(p); out[30 + i * 3] = ' '; } out[28 + i * 3] = '\n'; -- 1.5.5.1.404.g981f6