platform/x86/intel/pmc: Rename pmc_index -> pmcidx
Subsystems (2)
Ilpo Järvinen
maintainerPATCH 1/1 platform/x86/intel/pmc: Rename pmc_index -> pmcidx
Rename pmc_index variables to pmcidx which contains the same amount information with less characters (helps to shorten e.g. for loop lines).
Also change pmc_idx -> pmcidx to keep formatting consistent and similar to e.g. "pmcdev".
Signed-off-by Ilpo Järvinen <[email protected]>
--- drivers/platform/x86/intel/pmc/core.c | 36 ++++++++++----------- drivers/platform/x86/intel/pmc/core_ssram.c | 12 +++---- 2 files changed, 24 insertions(+), 24 deletions(-)
drivers/platform/x86/intel/pmc/core.c +18 -18
@@ -257,7 +257,7 @@ static unsigned int pmc_core_lpm_get_arr_size(const struct pmc_bit_map **maps) }static void pmc_core_lpm_display (struct pmc *pmc,struct device *dev, -struct seq_file *s,u32 offset,int pmc_index, +struct seq_file *s,u32 offset,int pmcidx,const char *str,const struct pmc_bit_map **maps) {
@@ -276,19 +276,19 @@ static void pmc_core_lpm_display(struct pmc *pmc, struct device *dev,for (idx =0 ; idx < arr_size; idx++) {if (dev) -dev_info (dev,"\nPMC%d:LPM_%s_%d:\t0x%x\n" , pmc_index, str, idx, +dev_info (dev,"\nPMC%d:LPM_%s_%d:\t0x%x\n" , pmcidx, str, idx, lpm_regs[idx]);if (s) -seq_printf (s,"\nPMC%d:LPM_%s_%d:\t0x%x\n" , pmc_index, str, idx, +seq_printf (s,"\nPMC%d:LPM_%s_%d:\t0x%x\n" , pmcidx, str, idx, lpm_regs[idx]);for (index =0 ; maps[idx][index].name && index < len; index++) { bit_mask = maps[idx][index].bit_mask;if (dev) -dev_info (dev,"PMC%d:%-30s %-30d\n" , pmc_index, +dev_info (dev,"PMC%d:%-30s %-30d\n" , pmcidx, maps[idx][index].name, lpm_regs[idx] & bit_mask ?1 :0 );if (s) -seq_printf (s,"PMC%d:%-30s %-30d\n" , pmc_index, +seq_printf (s,"PMC%d:%-30s %-30d\n" , pmcidx, maps[idx][index].name, lpm_regs[idx] & bit_mask ?1 :0 ); }
@@ -305,10 +305,10 @@ static inline u8 pmc_core_reg_read_byte(struct pmc *pmc, int offset) }static void pmc_core_display_map (struct seq_file *s,int index,int idx,int ip, -int pmc_index,u8 pf_reg,const struct pmc_bit_map **pf_map) +int pmcidx,u8 pf_reg,const struct pmc_bit_map **pf_map) {seq_printf (s,"PMC%d:PCH IP: %-2d - %-32s\tState: %s\n" , - pmc_index, ip, pf_map[idx][index].name, + pmcidx, ip, pf_map[idx][index].name, pf_map[idx][index].bit_mask & pf_reg ?"Off" :"On" ); }
@@ -465,7 +465,7 @@ int pmc_core_send_ltr_ignore(struct pmc_dev *pmcdev, u32 value, int ignore)struct pmc *pmc;const struct pmc_reg_map *map;u32 reg; -unsigned int pmc_index; +unsigned int pmcidx;int ltr_index; ltr_index = value;
@@ -473,8 +473,8 @@ int pmc_core_send_ltr_ignore(struct pmc_dev *pmcdev, u32 value, int ignore)* is based on the contiguous indexes from ltr_show output. * pmc index and ltr index needs to be calculated from it. */ -for (pmc_index =0 ; pmc_index <ARRAY_SIZE (pmcdev->pmcs) && ltr_index >=0 ; pmc_index++) { - pmc = pmcdev->pmcs[pmc_index]; +for (pmcidx =0 ; pmcidx <ARRAY_SIZE (pmcdev->pmcs) && ltr_index >=0 ; pmcidx++) { + pmc = pmcdev->pmcs[pmcidx];if (!pmc)continue ;
@@ -491,10 +491,10 @@ int pmc_core_send_ltr_ignore(struct pmc_dev *pmcdev, u32 value, int ignore) ltr_index = ltr_index - (map->ltr_ignore_max +2 ) -1 ; } -if (pmc_index >=ARRAY_SIZE (pmcdev->pmcs) || ltr_index <0 ) +if (pmcidx >=ARRAY_SIZE (pmcdev->pmcs) || ltr_index <0 )return -EINVAL ; -pr_debug ("ltr_ignore for pmc%d: ltr_index:%d\n" , pmc_index, ltr_index); +pr_debug ("ltr_ignore for pmc%d: ltr_index:%d\n" , pmcidx, ltr_index);guard (mutex)(&pmcdev->lock);
@@ -827,7 +827,7 @@ static int pmc_core_substate_l_sts_regs_show(struct seq_file *s, void *unused) }DEFINE_SHOW_ATTRIBUTE (pmc_core_substate_l_sts_regs); -static void pmc_core_substate_req_header_show (struct seq_file *s,int pmc_index) +static void pmc_core_substate_req_header_show (struct seq_file *s,int pmcidx) {struct pmc_dev *pmcdev = s->private;int mode;
@@ -846,11 +846,11 @@ static int pmc_core_substate_req_regs_show(struct seq_file *s, void *unused)u32 sts_offset;u32 sts_offset_live;u32 *lpm_req_regs; -unsigned int mp, pmc_index; +unsigned int mp, pmcidx;int num_maps; -for (pmc_index =0 ; pmc_index <ARRAY_SIZE (pmcdev->pmcs); ++pmc_index) { -struct pmc *pmc = pmcdev->pmcs[pmc_index]; +for (pmcidx =0 ; pmcidx <ARRAY_SIZE (pmcdev->pmcs); ++pmcidx) { +struct pmc *pmc = pmcdev->pmcs[pmcidx];const struct pmc_bit_map **maps;if (!pmc)
@@ -871,7 +871,7 @@ static int pmc_core_substate_req_regs_show(struct seq_file *s, void *unused)continue ;/* Display the header */ -pmc_core_substate_req_header_show (s, pmc_index); +pmc_core_substate_req_header_show (s, pmcidx);/* Loop over maps */ for (mp =0 ; mp < num_maps; mp++) {
@@ -909,7 +909,7 @@ static int pmc_core_substate_req_regs_show(struct seq_file *s, void *unused) }/* Display the element name in the first column */ -seq_printf (s,"pmc%d: %26s |" , pmc_index, map[i].name); +seq_printf (s,"pmc%d: %26s |" , pmcidx, map[i].name);/* Loop over the enabled states and display if required */ pmc_for_each_mode (mode, pmcdev) {
drivers/platform/x86/intel/pmc/core_ssram.c +6 -6
@@ -219,9 +219,9 @@ static inline u64 get_base(void __iomem *addr, u32 offset)static int pmc_core_pmc_add (struct pmc_dev *pmcdev,u64 pwrm_base, -const struct pmc_reg_map *reg_map,int pmc_index) +const struct pmc_reg_map *reg_map,int pmcidx) { -struct pmc *pmc = pmcdev->pmcs[pmc_index]; +struct pmc *pmc = pmcdev->pmcs[pmcidx];if (!pwrm_base)return -ENODEV ;
@@ -242,13 +242,13 @@ pmc_core_pmc_add(struct pmc_dev *pmcdev, u64 pwrm_base,return -ENOMEM ; } - pmcdev->pmcs[pmc_index] = pmc; + pmcdev->pmcs[pmcidx] = pmc;return 0 ; }static int -pmc_core_ssram_get_pmc (struct pmc_dev *pmcdev,int pmc_idx,u32 offset) +pmc_core_ssram_get_pmc (struct pmc_dev *pmcdev,int pmcidx,u32 offset) {struct pci_dev *ssram_pcidev = pmcdev->ssram_pcidev; void __iomem __free(pmc_core_iounmap) *tmp_ssram = NULL;
@@ -265,7 +265,7 @@ pmc_core_ssram_get_pmc(struct pmc_dev *pmcdev, int pmc_idx, u32 offset)if (!tmp_ssram)return -ENOMEM ; -if (pmc_idx !=PMC_IDX_MAIN ) { +if (pmcidx !=PMC_IDX_MAIN ) {/* * The secondary PMC BARS (which are behind hidden PCI devices) * are read from fixed offsets in MMIO of the primary PMC BAR.
@@ -293,7 +293,7 @@ pmc_core_ssram_get_pmc(struct pmc_dev *pmcdev, int pmc_idx, u32 offset)if (!map)return -ENODEV ; -return pmc_core_pmc_add (pmcdev, pwrm_base, map, pmc_idx); +return pmc_core_pmc_add (pmcdev, pwrm_base, map, pmcidx); }int pmc_core_ssram_init (struct pmc_dev *pmcdev,int func)
base-commit: 1a9239bb4253f9076b5b4b2a1a4e8d7defd77a95
Signature · 1 line
2.39.5