scsi: hisi_sas: Don't create debugfs dump folder twice

commit 35160421b63d4753a72e9f72ebcdd9d6f88f84b9 upstream.

Due to a merge error, we attempt to create 2x debugfs dump folders, which
fails:
[  861.101914] debugfs: Directory 'dump' with parent '0000:74:02.0'
already present!

This breaks the dump function.

To fix, remove the superfluous attempt to create the folder.

Fixes: 7ec7082c57ec ("scsi: hisi_sas: Add hisi_sas_debugfs_alloc() to centralise allocation")
Link: https://lore.kernel.org/r/1571926105-74636-2-git-send-email-john.garry@huawei.com
Signed-off-by: Xiang Chen <chenxiang66@hisilicon.com>
Signed-off-by: John Garry <john.garry@huawei.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/scsi/hisi_sas/hisi_sas_main.c b/drivers/scsi/hisi_sas/hisi_sas_main.c
index 633effb09c9cc0a9107ed1ced2d2f5453386ef30..849335d76cf6a6ffbb92dc6fb3e9f257966940ab 100644 (file)
--- a/drivers/scsi/hisi_sas/hisi_sas_main.c
+++ b/drivers/scsi/hisi_sas/hisi_sas_main.c
@@ -3719,9 +3719,6 @@ static int hisi_sas_debugfs_alloc(struct hisi_hba *hisi_hba)
        int p, c, d;
        size_t sz;
 
-       hisi_hba->debugfs_dump_dentry =
-                       debugfs_create_dir("dump", hisi_hba->debugfs_dir);
-
        sz = hw->debugfs_reg_array[DEBUGFS_GLOBAL]->count * 4;
        hisi_hba->debugfs_regs[DEBUGFS_GLOBAL] =
                                devm_kmalloc(dev, sz, GFP_KERNEL);