OSDN Git Service

scsi: ips: don't use custom hex_asc_upper[] table
authorAndy Shevchenko <andy.shevchenko@gmail.com>
Sat, 22 Oct 2016 17:32:29 +0000 (20:32 +0300)
committerMartin K. Petersen <martin.petersen@oracle.com>
Tue, 8 Nov 2016 22:29:57 +0000 (17:29 -0500)
We have table of the HEX characters in the kernel. Replace custom by a
generic one.

Cc: Adaptec OEM Raid Solutions <aacraid@adaptec.com>
Signed-off-by: Andy Shevchenko <andy.shevchenko@gmail.com>
Reviewed-by: Ewan D. Milne <emilne@redhat.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
drivers/scsi/ips.c

index 02cb76f..3419e1b 100644 (file)
@@ -2241,9 +2241,6 @@ ips_get_bios_version(ips_ha_t * ha, int intr)
        uint8_t minor;
        uint8_t subminor;
        uint8_t *buffer;
-       char hexDigits[] =
-           { '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C',
-     'D', 'E', 'F' };
 
        METHOD_TRACE("ips_get_bios_version", 1);
 
@@ -2374,13 +2371,13 @@ ips_get_bios_version(ips_ha_t * ha, int intr)
                }
        }
 
-       ha->bios_version[0] = hexDigits[(major & 0xF0) >> 4];
+       ha->bios_version[0] = hex_asc_upper_hi(major);
        ha->bios_version[1] = '.';
-       ha->bios_version[2] = hexDigits[major & 0x0F];
-       ha->bios_version[3] = hexDigits[subminor];
+       ha->bios_version[2] = hex_asc_upper_lo(major);
+       ha->bios_version[3] = hex_asc_upper_lo(subminor);
        ha->bios_version[4] = '.';
-       ha->bios_version[5] = hexDigits[(minor & 0xF0) >> 4];
-       ha->bios_version[6] = hexDigits[minor & 0x0F];
+       ha->bios_version[5] = hex_asc_upper_hi(minor);
+       ha->bios_version[6] = hex_asc_upper_lo(minor);
        ha->bios_version[7] = 0;
 }