The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=16471f47163ceb97d193d22858703eaeb86b4b9f
commit 16471f47163ceb97d193d22858703eaeb86b4b9f Author: John Baldwin <[email protected]> AuthorDate: 2022-04-12 21:58:58 +0000 Commit: John Baldwin <[email protected]> CommitDate: 2022-04-12 21:58:58 +0000 ppc hwpmc: Remove unused variables. --- sys/dev/hwpmc/hwpmc_mpc7xxx.c | 6 ------ sys/dev/hwpmc/hwpmc_ppc970.c | 5 ----- 2 files changed, 11 deletions(-) diff --git a/sys/dev/hwpmc/hwpmc_mpc7xxx.c b/sys/dev/hwpmc/hwpmc_mpc7xxx.c index c62c0791af01..799e997829ce 100644 --- a/sys/dev/hwpmc/hwpmc_mpc7xxx.c +++ b/sys/dev/hwpmc/hwpmc_mpc7xxx.c @@ -348,17 +348,11 @@ mpc7xxx_pmcn_write(unsigned int pmc, uint32_t val) static void mpc7xxx_set_pmc(int cpu, int ri, int config) { - struct pmc *pm; - struct pmc_hw *phw; register_t pmc_mmcr; - uint32_t config_mask; - phw = &powerpc_pcpu[cpu]->pc_ppcpmcs[ri]; - pm = phw->phw_pmc; /* The mask is inverted (enable is 1) compared to the flags in * MMCR0, which are Freeze flags. */ - config_mask = ~config & POWERPC_PMC_ENABLE; config &= ~POWERPC_PMC_ENABLE; /* Enable/disable the PMC. */ diff --git a/sys/dev/hwpmc/hwpmc_ppc970.c b/sys/dev/hwpmc/hwpmc_ppc970.c index 3e92c4dc6aa2..b3786f3b6674 100644 --- a/sys/dev/hwpmc/hwpmc_ppc970.c +++ b/sys/dev/hwpmc/hwpmc_ppc970.c @@ -256,14 +256,9 @@ static size_t ppc970_event_codes_size = nitems(ppc970_event_codes); static void ppc970_set_pmc(int cpu, int ri, int config) { - struct pmc *pm; - struct pmc_hw *phw; register_t pmc_mmcr; int config_mask; - phw = &powerpc_pcpu[cpu]->pc_ppcpmcs[ri]; - pm = phw->phw_pmc; - if (config == PMCN_NONE) config = PMC970N_NONE;
