diff options
| author | Gilad Broner <gbroner@codeaurora.org> | 2015-02-16 17:54:03 +0200 |
|---|---|---|
| committer | David Keitel <dkeitel@codeaurora.org> | 2016-03-22 10:59:00 -0700 |
| commit | 2d109dcf970558b4397eddac1ed1773a3c8f9a29 (patch) | |
| tree | 7acdbeef6cb71dd31213ef3be12c19d96b4d14ad | |
| parent | 43b632cb9759498dfc7ed6ed38cefdd326c22d06 (diff) | |
scsi: ufs: remove debugfs entries on driver unloading
debugfs entries that were set up on driver initialization
were not removed in the driver unloading path.
Added removal of the debugfs entries.
Also, cleaned up the unnecessary macro wrapping those functions.
Change-Id: I656b1f76713684547d1f9ca3aa75430b47bd5eff
Signed-off-by: Gilad Broner <gbroner@codeaurora.org>
| -rw-r--r-- | drivers/scsi/ufs/ufs-debugfs.h | 11 | ||||
| -rw-r--r-- | drivers/scsi/ufs/ufshcd.c | 9 |
2 files changed, 8 insertions, 12 deletions
diff --git a/drivers/scsi/ufs/ufs-debugfs.h b/drivers/scsi/ufs/ufs-debugfs.h index f576571ee4db..26fd58f2a2ff 100644 --- a/drivers/scsi/ufs/ufs-debugfs.h +++ b/drivers/scsi/ufs/ufs-debugfs.h @@ -25,23 +25,22 @@ #ifdef CONFIG_DEBUG_FS void ufsdbg_add_debugfs(struct ufs_hba *hba); - void ufsdbg_remove_debugfs(struct ufs_hba *hba); void ufsdbg_fail_request(struct ufs_hba *hba, u32 *intr_status); void ufsdbg_pr_buf_to_std(struct ufs_hba *hba, int offset, int num_regs, char *str, void *priv); #else -void ufsdbg_add_debugfs(struct ufs_hba *hba) +static inline void ufsdbg_add_debugfs(struct ufs_hba *hba) { } -void ufsdbg_remove_debugfs(struct ufs_hba *hba) +static inline void ufsdbg_remove_debugfs(struct ufs_hba *hba) { } -void ufsdbg_fail_request(struct ufs_hba *hba, u32 *intr_status) +static inline void ufsdbg_fail_request(struct ufs_hba *hba, u32 *intr_status) { } -void ufsdbg_pr_buf_to_std(struct ufs_hba *hba, int offset, int num_regs, - char *str, void *priv) +static inline void ufsdbg_pr_buf_to_std(struct ufs_hba *hba, int offset, + int num_regs, char *str, void *priv) { } #endif diff --git a/drivers/scsi/ufs/ufshcd.c b/drivers/scsi/ufs/ufshcd.c index d47272a8c438..4ec60c19f42d 100644 --- a/drivers/scsi/ufs/ufshcd.c +++ b/drivers/scsi/ufs/ufshcd.c @@ -98,10 +98,6 @@ static int ufshcd_tag_req_type(struct request *rq) hba->ufs_stats.q_depth--; \ } while (0) -#define UFSDBG_ADD_DEBUGFS(hba) ufsdbg_add_debugfs(hba); - -#define UFSDBG_REMOVE_DEBUGFS(hba) ufsdbg_remove_debugfs(hba); - static void update_req_stats(struct ufs_hba *hba, struct ufshcd_lrb *lrbp) { int rq_type; @@ -8146,6 +8142,7 @@ void ufshcd_remove(struct ufs_hba *hba) devfreq_remove_device(hba->devfreq); } ufshcd_hba_exit(hba); + ufsdbg_remove_debugfs(hba); } EXPORT_SYMBOL_GPL(ufshcd_remove); @@ -8706,7 +8703,8 @@ int ufshcd_init(struct ufs_hba *hba, void __iomem *mmio_base, unsigned int irq) async_schedule(ufshcd_async_scan, hba); - UFSDBG_ADD_DEBUGFS(hba) + ufsdbg_add_debugfs(hba); + ufshcd_add_sysfs_nodes(hba); return 0; @@ -8719,7 +8717,6 @@ exit_gating: ufshcd_exit_clk_gating(hba); out_disable: hba->is_irq_enabled = false; - UFSDBG_REMOVE_DEBUGFS(hba) ufshcd_hba_exit(hba); out_error: return err; |