[PATCH v4 05/18] platform/x86/intel/pmt: Add helpers for callback info

["Michael J. Ruhl" <michael.j.ruhl@intel.com>]

Refactor some open coded checks into helpers.

Signed-off-by: Michael J. Ruhl <michael.j.ruhl@intel.com>
---
 drivers/platform/x86/intel/pmt/class.c    |  2 +-
 drivers/platform/x86/intel/pmt/class.h    | 15 +++++++++++++++
 drivers/platform/x86/intel/pmt/crashlog.c |  4 ++--
 3 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/drivers/platform/x86/intel/pmt/class.c b/drivers/platform/x86/intel/pmt/class.c
index 402d51df834a..af7c951b569a 100644
--- a/drivers/platform/x86/intel/pmt/class.c
+++ b/drivers/platform/x86/intel/pmt/class.c
@@ -64,7 +64,7 @@ pmt_memcpy64_fromio(void *to, const u64 __iomem *from, size_t count)
 int pmt_telem_read_mmio(struct device *dev, struct pmt_callbacks *cb, u32 guid, void *buf,
 			void __iomem *addr, loff_t off, u32 count)
 {
-	if (cb && cb->read_telem)
+	if (is_cb_read_telem(cb))
 		return cb->read_telem(dev, guid, buf, off, count);
 
 	addr += off;
diff --git a/drivers/platform/x86/intel/pmt/class.h b/drivers/platform/x86/intel/pmt/class.h
index 258cb460e61c..d8291a5f08a7 100644
--- a/drivers/platform/x86/intel/pmt/class.h
+++ b/drivers/platform/x86/intel/pmt/class.h
@@ -71,6 +71,21 @@ struct intel_pmt_namespace {
 				struct intel_pmt_entry *entry);
 };
 
+static inline bool is_cb_read_telem(struct pmt_callbacks *cb)
+{
+	return cb && cb->read_telem ? true : false;
+}
+
+static inline bool is_cb_read_reg(struct pmt_callbacks *cb)
+{
+	return cb && cb->read_reg ? true : false;
+}
+
+static inline bool is_cb_write_reg(struct pmt_callbacks *cb)
+{
+	return cb && cb->write_reg ? true : false;
+}
+
 int pmt_telem_read_mmio(struct device *dev, struct pmt_callbacks *cb, u32 guid, void *buf,
 			void __iomem *addr, loff_t off, u32 count);
 bool intel_pmt_is_early_client_hw(struct device *dev);
diff --git a/drivers/platform/x86/intel/pmt/crashlog.c b/drivers/platform/x86/intel/pmt/crashlog.c
index 142c368a60f8..32f6a7d42b8d 100644
--- a/drivers/platform/x86/intel/pmt/crashlog.c
+++ b/drivers/platform/x86/intel/pmt/crashlog.c
@@ -132,7 +132,7 @@ static int pmt_crashlog_read_reg(struct intel_pmt_entry *entry, u32 *reg, u32 of
 
 	*reg = 0;
 
-	if (entry->cb && entry->cb->read_reg) {
+	if (is_cb_read_reg(entry->cb)) {
 		ret = entry->cb->read_reg(entry->dev, entry->header.guid, reg, offset);
 		if (ret) {
 			pr_err_ratelimited("failed to read reg: %d\n", ret);
@@ -164,7 +164,7 @@ static int pmt_crashlog_rmw(struct crashlog_entry *crashlog, u32 bit, bool set)
 	else
 		reg &= ~bit;
 
-	if (entry->cb && entry->cb->write_reg) {
+	if (is_cb_write_reg(entry->cb)) {
 		ret = entry->cb->write_reg(entry->dev, entry->header.guid, reg, control->offset);
 		if (ret) {
 			pr_err_ratelimited("failed to write reg: %d\n", ret);
-- 
2.43.0