在 2017/12/20 1:37, Andy Shevchenko 写道:
The function sas_parse_addr() could be easily substituted by hex2bin() which is
in kernel library code.

Cc: Christoph Hellwig <h...@lst.de>
Signed-off-by: Andy Shevchenko <andriy.shevche...@linux.intel.com>

Tested-by: Xiang Chen <chenxian...@hisilicon.com>

---
  drivers/scsi/libsas/sas_scsi_host.c | 20 ++++----------------
  1 file changed, 4 insertions(+), 16 deletions(-)

diff --git a/drivers/scsi/libsas/sas_scsi_host.c 
b/drivers/scsi/libsas/sas_scsi_host.c
index 58476b728c57..626727207889 100644
--- a/drivers/scsi/libsas/sas_scsi_host.c
+++ b/drivers/scsi/libsas/sas_scsi_host.c
@@ -27,6 +27,7 @@
  #include <linux/firmware.h>
  #include <linux/export.h>
  #include <linux/ctype.h>
+#include <linux/kernel.h>
#include "sas_internal.h" @@ -946,21 +947,6 @@ void sas_target_destroy(struct scsi_target *starget)
        sas_put_device(found_dev);
  }
-static void sas_parse_addr(u8 *sas_addr, const char *p)
-{
-       int i;
-       for (i = 0; i < SAS_ADDR_SIZE; i++) {
-               u8 h, l;
-               if (!*p)
-                       break;
-               h = isdigit(*p) ? *p-'0' : toupper(*p)-'A'+10;
-               p++;
-               l = isdigit(*p) ? *p-'0' : toupper(*p)-'A'+10;
-               p++;
-               sas_addr[i] = (h<<4) | l;
-       }
-}
-
  #define SAS_STRING_ADDR_SIZE  16
int sas_request_addr(struct Scsi_Host *shost, u8 *addr)
@@ -977,7 +963,9 @@ int sas_request_addr(struct Scsi_Host *shost, u8 *addr)
                goto out;
        }
- sas_parse_addr(addr, fw->data);
+       res = hex2bin(addr, fw->data, strnlen(fw->data, SAS_ADDR_SIZE * 2) / 2);
+       if (res)
+               goto out;
out:
        release_firmware(fw);


Reply via email to