From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758850AbYELTGf (ORCPT ); Mon, 12 May 2008 15:06:35 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1756855AbYELTFq (ORCPT ); Mon, 12 May 2008 15:05:46 -0400 Received: from yw-out-2324.google.com ([74.125.46.30]:38624 "EHLO yw-out-2324.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756899AbYELTFn (ORCPT ); Mon, 12 May 2008 15:05:43 -0400 DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=subject:from:to:cc:content-type:date:message-id:mime-version:x-mailer:content-transfer-encoding; b=DzWrYhDY2D1yAJwWur3SePE/pbAJZcVurlT0vbhqZplmKxM2m/phlBp96l+0WvcdOtQ0xmLA0LFJ1FORyQ3uFayO+CLAZ1lGRpsOs9aRkuIbHQA8zvabb6ls6oD5WmFW1g+s5w7U8p2+LGx7X7/QGL8A5N8w3gPn2tAhBJq9Sj8= Subject: [PATCH 02/12] scsi: use the common hex_asc array rather than a private one From: Harvey Harrison To: Andrew Morton Cc: LKML , linux-scsi , James Bottomley Content-Type: text/plain Date: Mon, 12 May 2008 12:05:35 -0700 Message-Id: <1210619135.24092.53.camel@brick> Mime-Version: 1.0 X-Mailer: Evolution 2.12.1 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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