From 0fe711f7ea317dfef2c60417e31395450fc8c09b Mon Sep 17 00:00:00 2001
From: Yaniv Gardi <ygardi@codeaurora.org>
Date: Wed, 4 Feb 2015 15:15:41 +0200
Subject: [PATCH] scsi: ufs: renaming "debugfs" files with correct prefix

The old names doesn't include the driver name (as prefix or at all).
This change adds the "ufs" and the "ufs-qcom" prefix to file names
and by that creates uniform naming convention in the driver.

Change-Id: I221b489cc4237882d7e62a9d80bc1ee3f2bcf4a6
Signed-off-by: Yaniv Gardi <ygardi@codeaurora.org>
---
 drivers/scsi/ufs/Makefile                               | 2 +-
 drivers/scsi/ufs/{debugfs.c => ufs-debugfs.c}           | 4 ++--
 drivers/scsi/ufs/{debugfs.h => ufs-debugfs.h}           | 0
 drivers/scsi/ufs/{qcom-debugfs.c => ufs-qcom-debugfs.c} | 4 ++--
 drivers/scsi/ufs/{qcom-debugfs.h => ufs-qcom-debugfs.h} | 0
 drivers/scsi/ufs/ufs-qcom-ice.c                         | 2 +-
 drivers/scsi/ufs/ufs-qcom.c                             | 2 +-
 drivers/scsi/ufs/ufshcd.c                               | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)
 rename drivers/scsi/ufs/{debugfs.c => ufs-debugfs.c} (99%)
 rename drivers/scsi/ufs/{debugfs.h => ufs-debugfs.h} (100%)
 rename drivers/scsi/ufs/{qcom-debugfs.c => ufs-qcom-debugfs.c} (99%)
 rename drivers/scsi/ufs/{qcom-debugfs.h => ufs-qcom-debugfs.h} (100%)

diff --git a/drivers/scsi/ufs/Makefile b/drivers/scsi/ufs/Makefile
index 58ee7fef70b2..ce98c095245c 100644
--- a/drivers/scsi/ufs/Makefile
+++ b/drivers/scsi/ufs/Makefile
@@ -5,4 +5,4 @@ obj-$(CONFIG_SCSI_UFSHCD) += ufshcd.o ufs_quirks.o
 obj-$(CONFIG_SCSI_UFSHCD_PCI) += ufshcd-pci.o
 obj-$(CONFIG_SCSI_UFSHCD_PLATFORM) += ufshcd-pltfrm.o
 obj-$(CONFIG_SCSI_UFS_TEST) += ufs_test.o
-obj-$(CONFIG_DEBUG_FS) += debugfs.o qcom-debugfs.o
+obj-$(CONFIG_DEBUG_FS) += ufs-debugfs.o ufs-qcom-debugfs.o
diff --git a/drivers/scsi/ufs/debugfs.c b/drivers/scsi/ufs/ufs-debugfs.c
similarity index 99%
rename from drivers/scsi/ufs/debugfs.c
rename to drivers/scsi/ufs/ufs-debugfs.c
index 4ee7d8379602..1567797d8796 100644
--- a/drivers/scsi/ufs/debugfs.c
+++ b/drivers/scsi/ufs/ufs-debugfs.c
@@ -18,7 +18,7 @@
  */
 
 #include <linux/random.h>
-#include "debugfs.h"
+#include "ufs-debugfs.h"
 #include <linux/scsi/ufs/unipro.h>
 #include "ufshci.h"
 
@@ -854,7 +854,7 @@ static int ufsdbg_dme_read(void *data, u64 *attr_val, bool peer)
 	int ret;
 	struct ufs_hba *hba = data;
 	u32 attr_id, read_val = 0;
-	int (*read_func) (struct ufs_hba *, u32, u32 *);
+	int (*read_func)(struct ufs_hba *, u32, u32 *);
 
 	if (!hba)
 		return -EINVAL;
diff --git a/drivers/scsi/ufs/debugfs.h b/drivers/scsi/ufs/ufs-debugfs.h
similarity index 100%
rename from drivers/scsi/ufs/debugfs.h
rename to drivers/scsi/ufs/ufs-debugfs.h
diff --git a/drivers/scsi/ufs/qcom-debugfs.c b/drivers/scsi/ufs/ufs-qcom-debugfs.c
similarity index 99%
rename from drivers/scsi/ufs/qcom-debugfs.c
rename to drivers/scsi/ufs/ufs-qcom-debugfs.c
index 4cfa5a5a3ed3..f2ae82532da6 100644
--- a/drivers/scsi/ufs/qcom-debugfs.c
+++ b/drivers/scsi/ufs/ufs-qcom-debugfs.c
@@ -14,8 +14,8 @@
 
 #include <linux/debugfs.h>
 #include <linux/scsi/ufs/ufs-qcom.h>
-#include "qcom-debugfs.h"
-#include "debugfs.h"
+#include "ufs-qcom-debugfs.h"
+#include "ufs-debugfs.h"
 
 #define TESTBUS_CFG_BUFF_LINE_SIZE	sizeof("0xXY, 0xXY")
 
diff --git a/drivers/scsi/ufs/qcom-debugfs.h b/drivers/scsi/ufs/ufs-qcom-debugfs.h
similarity index 100%
rename from drivers/scsi/ufs/qcom-debugfs.h
rename to drivers/scsi/ufs/ufs-qcom-debugfs.h
diff --git a/drivers/scsi/ufs/ufs-qcom-ice.c b/drivers/scsi/ufs/ufs-qcom-ice.c
index 7a2b321ea95e..2fe52b9e98b7 100644
--- a/drivers/scsi/ufs/ufs-qcom-ice.c
+++ b/drivers/scsi/ufs/ufs-qcom-ice.c
@@ -19,7 +19,7 @@
 #include <crypto/ice.h>
 
 #include "ufs-qcom-ice.h"
-#include "qcom-debugfs.h"
+#include "ufs-qcom-debugfs.h"
 
 #define UFS_QCOM_CRYPTO_LABEL "ufs-qcom-crypto"
 /* Timeout waiting for ICE initialization, that requires TZ access */
diff --git a/drivers/scsi/ufs/ufs-qcom.c b/drivers/scsi/ufs/ufs-qcom.c
index c9d6cdf415c3..8af715d4a266 100644
--- a/drivers/scsi/ufs/ufs-qcom.c
+++ b/drivers/scsi/ufs/ufs-qcom.c
@@ -35,7 +35,7 @@
 #include "ufs-qcom.h"
 #include "ufshci.h"
 #include "ufs-qcom-ice.h"
-#include "qcom-debugfs.h"
+#include "ufs-qcom-debugfs.h"
 
 #define UFS_QCOM_DEFAULT_DBG_PRINT_EN	\
 	(UFS_QCOM_DBG_PRINT_REGS_EN | UFS_QCOM_DBG_PRINT_TEST_BUS_EN)
diff --git a/drivers/scsi/ufs/ufshcd.c b/drivers/scsi/ufs/ufshcd.c
index 5ff72b47af23..7b9ca922c892 100644
--- a/drivers/scsi/ufs/ufshcd.c
+++ b/drivers/scsi/ufs/ufshcd.c
@@ -45,7 +45,7 @@
 #include <linux/scsi/ufs/ufshcd.h>
 #include "ufshci.h"
 #include "ufs_quirks.h"
-#include "debugfs.h"
+#include "ufs-debugfs.h"
 
 #define CREATE_TRACE_POINTS
 #include <trace/events/ufs.h>