Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d2ce739a authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ufs: fix compilation when CONFIG_DEBUG_FS is disabled"

parents 191fa5dc 69d5215f

drivers/scsi/ufs/ufshcd.h

+3 −2
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 
 *

 * This code is based on drivers/scsi/ufs/ufshcd.h

 * Copyright (C) 2011-2013 Samsung India Software Operations

 * Copyright (c) 2013-2019, The Linux Foundation. All rights reserved.

 * Copyright (c) 2013-2020, The Linux Foundation. All rights reserved.

 *

 * Authors:

 *	Santosh Yaraganavi <santosh.sy@samsung.com>
@@ -1529,7 +1529,8 @@ static inline void ufshcd_vops_remove_debugfs(struct ufs_hba *hba) 
		hba->var->vops->remove_debugfs(hba);

}

#else

static inline void ufshcd_vops_add_debugfs(struct ufs_hba *hba, struct dentry *)

static inline void ufshcd_vops_add_debugfs(struct ufs_hba *hba,

					   struct dentry *root)

{

}

drivers/thermal/tsens.h

+5 −5
Original line number Diff line number Diff line
@@ -87,11 +87,11 @@ struct tsens_device; 
		}	\

	} while (0)

#else

#define	TSENS_DBG1(x...)		pr_debug(x)

#define	TSENS_DBG(x...)		pr_debug(x)

#define	TSENS_INFO(x...)		pr_info(x)

#define	TSENS_ERR(x...)		pr_err(x)

#define	TSENS_DUMP(x...)		pr_info(x)

#define	TSENS_DBG1(dev, msg, x...)		pr_debug(msg, ##x)

#define	TSENS_DBG(dev, msg, x...)		pr_debug(msg, ##x)

#define	TSENS_INFO(dev, msg, x...)		pr_info(msg, ##x)

#define	TSENS_ERR(dev, msg, x...)		pr_err(msg, ##x)

#define	TSENS_DUMP(dev, msg, x...)		pr_info(msg, ##x)

#endif



#if defined(CONFIG_THERMAL_TSENS)