From 21d2e5a5e6120af929e480e7844f9e95f932f5fb Mon Sep 17 00:00:00 2001 From: Dan Carpenter Date: Fri, 13 Sep 2013 15:53:10 +0300 Subject: [PATCH] skd: use memcpy() as a cleanup The code here is copying the version to inq.driver_version but we don't want it to be NUL terminated. Instead we pad the rest of the array with spaces. It's fewer lines to use memcpy() and maybe a little nicer. Signed-off-by: Dan Carpenter Signed-off-by: Jens Axboe --- drivers/block/skd_main.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/drivers/block/skd_main.c b/drivers/block/skd_main.c index 467ae1a39661..773e79370a15 100644 --- a/drivers/block/skd_main.c +++ b/drivers/block/skd_main.c @@ -2899,9 +2899,7 @@ static void skd_do_inq_page_da(struct skd_device *skdev, volatile struct fit_comp_error_info *skerr, uint8_t *cdb, uint8_t *buf) { - unsigned ver_byte; unsigned max_bytes; - char *ver = DRV_VER_COMPL; struct driver_inquiry_data inq; u16 val; @@ -2945,12 +2943,8 @@ static void skd_do_inq_page_da(struct skd_device *skdev, /* Driver version, fixed lenth, padded with spaces on the right */ inq.driver_version_length = sizeof(inq.driver_version); memset(&inq.driver_version, ' ', sizeof(inq.driver_version)); - for (ver_byte = 0; ver_byte < sizeof(inq.driver_version); ver_byte++) { - if (ver[ver_byte] != 0) - inq.driver_version[ver_byte] = ver[ver_byte]; - else - break; - } + memcpy(inq.driver_version, DRV_VER_COMPL, + min(sizeof(inq.driver_version), strlen(DRV_VER_COMPL))); inq.page_length = cpu_to_be16((sizeof(inq) - 4)); -- 2.39.5