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

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

Merge "drivers: Fix compilation issues when debugfs is disabled"

parents 17283d7a 3f198558

drivers/scsi/ufs/ufshcd.h

+5 −1
Original line number Diff line number Diff line
@@ -524,7 +524,8 @@ struct ufs_uic_err_reg_hist { 


#endif



#if defined(CONFIG_SCSI_UFSHCD_QTI) && defined(CONFIG_DEBUG_FS)

#ifdef CONFIG_SCSI_UFSHCD_QTI

#ifdef CONFIG_DEBUG_FS

/**

 * struct ufshcd_req_stat - statistics for request handling times (in usec)

 * @min: shortest time measured
@@ -550,6 +551,7 @@ enum ts_types { 
	TS_FLUSH = 5,

	TS_NUM_STATS = 6,

};

#endif



enum ufshcd_ctx {

	QUEUE_CMD,
@@ -609,12 +611,14 @@ struct ufs_stats { 
	ktime_t last_hibern8_exit_tstamp;



#ifdef CONFIG_SCSI_UFSHCD_QTI

#ifdef CONFIG_DEBUG_FS

	bool enabled;

	u64 **tag_stats;

	int q_depth;

	int err_stats[UFS_ERR_MAX];

	struct ufshcd_req_stat req_stats[TS_NUM_STATS];

	int query_stats_arr[UPIU_QUERY_OPCODE_MAX][MAX_QUERY_IDN];

#endif

	u32 pa_err_cnt_total;

	u32 pa_err_cnt[UFS_EC_PA_MAX];

	u32 dl_err_cnt_total;

drivers/thermal/tsens.h

+5 −5
Original line number Diff line number Diff line
@@ -94,11 +94,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 IS_ENABLED(CONFIG_THERMAL_TSENS)