1 files changed, 8 insertions, 24 deletions

diff --git a/drivers/scsi/qedi/qedi_dbg.c b/drivers/scsi/qedi/qedi_dbg.c
index 8fd28b056f73..3383314a3882 100644
--- a/drivers/scsi/qedi/qedi_dbg.c
+++ b/drivers/scsi/qedi/qedi_dbg.c
@@ -16,10 +16,6 @@ qedi_dbg_err(struct qedi_dbg_ctx *qedi, const char *func, u32 line,
 {
         va_list va;
         struct va_format vaf;
-        char nfunc[32];
-
-        memset(nfunc, 0, sizeof(nfunc));
-        memcpy(nfunc, func, sizeof(nfunc) - 1);
 
         va_start(va, fmt);
 
@@ -28,9 +24,9 @@ qedi_dbg_err(struct qedi_dbg_ctx *qedi, const char *func, u32 line,
 
         if (likely(qedi) && likely(qedi->pdev))
                 pr_err("[%s]:[%s:%d]:%d: %pV", dev_name(&qedi->pdev->dev),
-                       nfunc, line, qedi->host_no, &vaf);
+                       func, line, qedi->host_no, &vaf);
         else
-                pr_err("[0000:00:00.0]:[%s:%d]: %pV", nfunc, line, &vaf);
+                pr_err("[0000:00:00.0]:[%s:%d]: %pV", func, line, &vaf);
 
         va_end(va);
 }
@@ -41,10 +37,6 @@ qedi_dbg_warn(struct qedi_dbg_ctx *qedi, const char *func, u32 line,
 {
         va_list va;
         struct va_format vaf;
-        char nfunc[32];
-
-        memset(nfunc, 0, sizeof(nfunc));
-        memcpy(nfunc, func, sizeof(nfunc) - 1);
 
         va_start(va, fmt);
 
@@ -56,9 +48,9 @@ qedi_dbg_warn(struct qedi_dbg_ctx *qedi, const char *func, u32 line,
 
         if (likely(qedi) && likely(qedi->pdev))
                 pr_warn("[%s]:[%s:%d]:%d: %pV", dev_name(&qedi->pdev->dev),
-                        nfunc, line, qedi->host_no, &vaf);
+                        func, line, qedi->host_no, &vaf);
         else
-                pr_warn("[0000:00:00.0]:[%s:%d]: %pV", nfunc, line, &vaf);
+                pr_warn("[0000:00:00.0]:[%s:%d]: %pV", func, line, &vaf);
 
 ret:
         va_end(va);
@@ -70,10 +62,6 @@ qedi_dbg_notice(struct qedi_dbg_ctx *qedi, const char *func, u32 line,
 {
         va_list va;
         struct va_format vaf;
-        char nfunc[32];
-
-        memset(nfunc, 0, sizeof(nfunc));
-        memcpy(nfunc, func, sizeof(nfunc) - 1);
 
         va_start(va, fmt);
 
@@ -85,10 +73,10 @@ qedi_dbg_notice(struct qedi_dbg_ctx *qedi, const char *func, u32 line,
 
         if (likely(qedi) && likely(qedi->pdev))
                 pr_notice("[%s]:[%s:%d]:%d: %pV",
-                          dev_name(&qedi->pdev->dev), nfunc, line,
+                          dev_name(&qedi->pdev->dev), func, line,
                           qedi->host_no, &vaf);
         else
-                pr_notice("[0000:00:00.0]:[%s:%d]: %pV", nfunc, line, &vaf);
+                pr_notice("[0000:00:00.0]:[%s:%d]: %pV", func, line, &vaf);
 
 ret:
         va_end(va);
@@ -100,10 +88,6 @@ qedi_dbg_info(struct qedi_dbg_ctx *qedi, const char *func, u32 line,
 {
         va_list va;
         struct va_format vaf;
-        char nfunc[32];
-
-        memset(nfunc, 0, sizeof(nfunc));
-        memcpy(nfunc, func, sizeof(nfunc) - 1);
 
         va_start(va, fmt);
 
@@ -115,9 +99,9 @@ qedi_dbg_info(struct qedi_dbg_ctx *qedi, const char *func, u32 line,
 
         if (likely(qedi) && likely(qedi->pdev))
                 pr_info("[%s]:[%s:%d]:%d: %pV", dev_name(&qedi->pdev->dev),
-                        nfunc, line, qedi->host_no, &vaf);
+                        func, line, qedi->host_no, &vaf);
         else
-                pr_info("[0000:00:00.0]:[%s:%d]: %pV", nfunc, line, &vaf);
+                pr_info("[0000:00:00.0]:[%s:%d]: %pV", func, line, &vaf);
 
 ret:
         va_end(va);