Merge branch 'x86-vdso-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[firefly-linux-kernel-4.4.55.git] / drivers / scsi / qla2xxx / qla_dfs.c

diff --git a/drivers/scsi/qla2xxx/qla_dfs.c b/drivers/scsi/qla2xxx/qla_dfs.c
index a5a4e1275bf2cd32532dd2949a7197c7f0a2f194..0b4c2b794c6f281629fb59540f8d013e76b55694 100644 (file)
--- a/drivers/scsi/qla2xxx/qla_dfs.c
+++ b/drivers/scsi/qla2xxx/qla_dfs.c
@@ -64,7 +64,7 @@ qla2x00_dfs_fce_open(struct inode *inode, struct file *file)
        /* Pause tracing to flush FCE buffers. */
        rval = qla2x00_disable_fce_trace(vha, &ha->fce_wr, &ha->fce_rd);
        if (rval)
-               qla_printk(KERN_WARNING, ha,
+               ql_dbg(ql_dbg_user, vha, 0x705c,
                    "DebugFS: Unable to disable FCE (%d).\n", rval);
 
        ha->flags.fce_enabled = 0;
@@ -92,7 +92,7 @@ qla2x00_dfs_fce_release(struct inode *inode, struct file *file)
        rval = qla2x00_enable_fce_trace(vha, ha->fce_dma, ha->fce_bufs,
            ha->fce_mb, &ha->fce_bufs);
        if (rval) {
-               qla_printk(KERN_WARNING, ha,
+               ql_dbg(ql_dbg_user, vha, 0x700d,
                    "DebugFS: Unable to reinitialize FCE (%d).\n", rval);
                ha->flags.fce_enabled = 0;
        }
@@ -125,8 +125,8 @@ qla2x00_dfs_setup(scsi_qla_host_t *vha)
        atomic_set(&qla2x00_dfs_root_count, 0);
        qla2x00_dfs_root = debugfs_create_dir(QLA2XXX_DRIVER_NAME, NULL);
        if (!qla2x00_dfs_root) {
-               qla_printk(KERN_NOTICE, ha,
-                   "DebugFS: Unable to create root directory.\n");
+               ql_log(ql_log_warn, vha, 0x00f7,
+                   "Unable to create debugfs root directory.\n");
                goto out;
        }
 
@@ -137,8 +137,8 @@ create_dir:
        mutex_init(&ha->fce_mutex);
        ha->dfs_dir = debugfs_create_dir(vha->host_str, qla2x00_dfs_root);
        if (!ha->dfs_dir) {
-               qla_printk(KERN_NOTICE, ha,
-                   "DebugFS: Unable to create ha directory.\n");
+               ql_log(ql_log_warn, vha, 0x00f8,
+                   "Unable to create debugfs ha directory.\n");
                goto out;
        }
 
@@ -148,8 +148,8 @@ create_nodes:
        ha->dfs_fce = debugfs_create_file("fce", S_IRUSR, ha->dfs_dir, vha,
            &dfs_fce_ops);
        if (!ha->dfs_fce) {
-               qla_printk(KERN_NOTICE, ha,
-                   "DebugFS: Unable to fce node.\n");
+               ql_log(ql_log_warn, vha, 0x00f9,
+                   "Unable to create debugfs fce node.\n");
                goto out;
        }
 out: