Commit e9c154ee authored by Ilpo Järvinen's avatar Ilpo Järvinen Committed by Lee Jones
Browse files

mfd: intel-m10-bmc: Move m10bmc_sys_read() away from header 



Move m10bmc_sys_read() out from the header to prepare it for adding
more code into the function which would make it too large to be a
static inline any more.

While at it, replace the vague wording in function comment with more
precise statements.

Reviewed-by: default avatarRuss Weight <russell.h.weight@intel.com>
Acked-by: Guenter Roeck <linux@roeck-us.net> # For hwmon
Signed-off-by: default avatarIlpo Järvinen <ilpo.jarvinen@linux.intel.com>
Reviewed-by: default avatarXu Yilun <yilun.xu@intel.com>
Signed-off-by: default avatarLee Jones <lee@kernel.org>
Link: https://lore.kernel.org/r/20230417092653.16487-4-ilpo.jarvinen@linux.intel.com
parent c452e3bd

drivers/hwmon/intel-m10-bmc-hwmon.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -794,3 +794,4 @@ MODULE_DEVICE_TABLE(platform, intel_m10bmc_hwmon_ids); 
MODULE_AUTHOR("Intel Corporation");

MODULE_AUTHOR("Intel Corporation");

MODULE_DESCRIPTION("Intel MAX 10 BMC hardware monitor");

MODULE_DESCRIPTION("Intel MAX 10 BMC hardware monitor");

MODULE_LICENSE("GPL");

MODULE_LICENSE("GPL");

MODULE_IMPORT_NS(INTEL_M10_BMC_CORE);

drivers/mfd/intel-m10-bmc-core.c

+14 −0
Original line number Original line Diff line number Diff line
@@ -12,6 +12,20 @@ 
#include <linux/mfd/intel-m10-bmc.h>

#include <linux/mfd/intel-m10-bmc.h>

#include <linux/module.h>

#include <linux/module.h>





/*

 * This function helps to simplify the accessing of the system registers.

 *

 * The base of the system registers is configured through the struct

 * csr_map.

 */

int m10bmc_sys_read(struct intel_m10bmc *m10bmc, unsigned int offset, unsigned int *val)

{

	const struct m10bmc_csr_map *csr_map = m10bmc->info->csr_map;



	return m10bmc_raw_read(m10bmc, csr_map->base + offset, val);

}

EXPORT_SYMBOL_NS_GPL(m10bmc_sys_read, INTEL_M10_BMC_CORE);



int m10bmc_sys_update_bits(struct intel_m10bmc *m10bmc, unsigned int offset,

int m10bmc_sys_update_bits(struct intel_m10bmc *m10bmc, unsigned int offset,

			   unsigned int msk, unsigned int val)

			   unsigned int msk, unsigned int val)

{

{

include/linux/mfd/intel-m10-bmc.h

+1 −16
Original line number Original line Diff line number Diff line
@@ -267,22 +267,7 @@ m10bmc_raw_read(struct intel_m10bmc *m10bmc, unsigned int addr, 
	return ret;

	return ret;

}

}





/*

int m10bmc_sys_read(struct intel_m10bmc *m10bmc, unsigned int offset, unsigned int *val);

 * The base of the system registers could be configured by HW developers, and

 * in HW SPEC, the base is not added to the addresses of the system registers.

 *

 * This function helps to simplify the accessing of the system registers. And if

 * the base is reconfigured in HW, SW developers could simply change the

 * csr_map's base accordingly.

 */

static inline int m10bmc_sys_read(struct intel_m10bmc *m10bmc, unsigned int offset,

				  unsigned int *val)

{

	const struct m10bmc_csr_map *csr_map = m10bmc->info->csr_map;



	return m10bmc_raw_read(m10bmc, csr_map->base + offset, val);

}



int m10bmc_sys_update_bits(struct intel_m10bmc *m10bmc, unsigned int offset,

int m10bmc_sys_update_bits(struct intel_m10bmc *m10bmc, unsigned int offset,

			   unsigned int msk, unsigned int val);

			   unsigned int msk, unsigned int val);