The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=43629a8b1805b2f362704d626c58b19626be0950
commit 43629a8b1805b2f362704d626c58b19626be0950 Author: John Baldwin <[email protected]> AuthorDate: 2022-04-13 23:08:22 +0000 Commit: John Baldwin <[email protected]> CommitDate: 2022-04-13 23:08:22 +0000 arm freescale: Remove unused variables. --- sys/arm/freescale/imx/imx_nop_usbphy.c | 3 --- sys/arm/freescale/vybrid/vf_adc.c | 3 --- sys/arm/freescale/vybrid/vf_tcon.c | 3 --- sys/arm/freescale/vybrid/vf_uart.c | 5 +---- 4 files changed, 1 insertion(+), 13 deletions(-) diff --git a/sys/arm/freescale/imx/imx_nop_usbphy.c b/sys/arm/freescale/imx/imx_nop_usbphy.c index 200511b2c273..357a237c2a61 100644 --- a/sys/arm/freescale/imx/imx_nop_usbphy.c +++ b/sys/arm/freescale/imx/imx_nop_usbphy.c @@ -75,9 +75,6 @@ usbphy_detach(device_t dev) static int usbphy_attach(device_t dev) { - struct usbphy_softc *sc; - - sc = device_get_softc(dev); /* * Turn on the phy clocks. diff --git a/sys/arm/freescale/vybrid/vf_adc.c b/sys/arm/freescale/vybrid/vf_adc.c index 7a506b89300e..bdb6e826e176 100644 --- a/sys/arm/freescale/vybrid/vf_adc.c +++ b/sys/arm/freescale/vybrid/vf_adc.c @@ -142,9 +142,6 @@ adc_probe(device_t dev) static void adc_intr(void *arg) { - struct adc_softc *sc; - - sc = arg; /* Conversation complete */ } diff --git a/sys/arm/freescale/vybrid/vf_tcon.c b/sys/arm/freescale/vybrid/vf_tcon.c index 475f86271c45..847641a30d22 100644 --- a/sys/arm/freescale/vybrid/vf_tcon.c +++ b/sys/arm/freescale/vybrid/vf_tcon.c @@ -74,13 +74,10 @@ static struct resource_spec tcon_spec[] = { uint32_t tcon_bypass(void) { - struct tcon_softc *sc; if (tcon_sc == NULL) return (1); - sc = tcon_sc; - WRITE4(tcon_sc, TCON0_CTRL1, TCON_BYPASS); return (0); diff --git a/sys/arm/freescale/vybrid/vf_uart.c b/sys/arm/freescale/vybrid/vf_uart.c index 50a0f9104e28..6a726910a140 100644 --- a/sys/arm/freescale/vybrid/vf_uart.c +++ b/sys/arm/freescale/vybrid/vf_uart.c @@ -339,10 +339,8 @@ vf_uart_bus_getsig(struct uart_softc *sc) static int vf_uart_bus_ioctl(struct uart_softc *sc, int request, intptr_t data) { - struct uart_bas *bas; int error; - bas = &sc->sc_bas; error = 0; uart_lock(sc->sc_hwmtx); switch (request) { @@ -369,7 +367,6 @@ vf_uart_bus_ipend(struct uart_softc *sc) int ipend; uint32_t usr1, usr2; int reg; - int sfifo; bas = &sc->sc_bas; ipend = 0; @@ -378,7 +375,7 @@ vf_uart_bus_ipend(struct uart_softc *sc) usr1 = uart_getreg(bas, UART_S1); usr2 = uart_getreg(bas, UART_S2); - sfifo = uart_getreg(bas, UART_SFIFO); + (void)uart_getreg(bas, UART_SFIFO); /* ack usr2 */ uart_setreg(bas, UART_S2, usr2);
