The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=a30eb84a5dc4cb3c7e50f4f01473eeeab8b5bbd3
commit a30eb84a5dc4cb3c7e50f4f01473eeeab8b5bbd3 Author: John Baldwin <[email protected]> AuthorDate: 2022-04-13 23:08:24 +0000 Commit: John Baldwin <[email protected]> CommitDate: 2022-04-13 23:08:24 +0000 powerpc mpc85xx: Remove unused variables. --- sys/powerpc/mpc85xx/fsl_diu.c | 2 -- sys/powerpc/mpc85xx/pci_mpc85xx.c | 4 ---- 2 files changed, 6 deletions(-) diff --git a/sys/powerpc/mpc85xx/fsl_diu.c b/sys/powerpc/mpc85xx/fsl_diu.c index b116809011dc..c29df5e5393b 100644 --- a/sys/powerpc/mpc85xx/fsl_diu.c +++ b/sys/powerpc/mpc85xx/fsl_diu.c @@ -214,12 +214,10 @@ diu_intr(void *arg) static int diu_set_pxclk(device_t dev, unsigned int freq) { - phandle_t node; unsigned long bus_freq; uint32_t pxclk_set; uint32_t clkdvd; - node = ofw_bus_get_node(device_get_parent(dev)); if ((bus_freq = mpc85xx_get_platform_clock()) <= 0) { device_printf(dev, "Unable to get bus frequency\n"); return (ENXIO); diff --git a/sys/powerpc/mpc85xx/pci_mpc85xx.c b/sys/powerpc/mpc85xx/pci_mpc85xx.c index 8d0c21342215..b6f7867f7f74 100644 --- a/sys/powerpc/mpc85xx/pci_mpc85xx.c +++ b/sys/powerpc/mpc85xx/pci_mpc85xx.c @@ -551,12 +551,10 @@ fsl_pcib_read_config(device_t dev, u_int bus, u_int slot, u_int func, u_int reg, int bytes) { struct fsl_pcib_softc *sc = device_get_softc(dev); - u_int devfn; if (bus == sc->sc_busnr && !sc->sc_pcie && slot < PCI_SLOT_FIRST) return (~0); - devfn = DEVFN(bus, slot, func); return (fsl_pcib_cfgread(sc, bus, slot, func, reg, bytes)); } @@ -770,11 +768,9 @@ fsl_pcib_decode_win(phandle_t node, struct fsl_pcib_softc *sc) static int fsl_pcib_alloc_msi(device_t dev, device_t child, int count, int maxcount, int *irqs) { - struct fsl_pcib_softc *sc; vmem_addr_t start; int err, i; - sc = device_get_softc(dev); if (msi_vmem == NULL) return (ENODEV);
