The branch main has been updated by jhb:
URL:
https://cgit.FreeBSD.org/src/commit/?id=0d46a96abffe8cbad55b1fce4fa0affb8cccc3b7
commit 0d46a96abffe8cbad55b1fce4fa0affb8cccc3b7
Author: John Baldwin <j...@freebsd.org>
AuthorDate: 2022-04-09 01:31:30 +0000
Commit: John Baldwin <j...@freebsd.org>
CommitDate: 2022-04-09 01:31:30 +0000
arm ti: Remove unused variables.
---
sys/arm/ti/am335x/am3359_cppi41.c | 2 --
sys/arm/ti/am335x/am335x_musb.c | 3 +--
sys/arm/ti/am335x/am335x_usb_phy.c | 2 --
sys/arm/ti/clk/ti_clk_dpll.c | 4 ----
sys/arm/ti/ti_mbox.c | 5 +----
sys/arm/ti/ti_pruss.c | 4 ----
sys/arm/ti/ti_spi.c | 5 -----
sys/arm/ti/ti_sysc.c | 3 ---
8 files changed, 2 insertions(+), 26 deletions(-)
diff --git a/sys/arm/ti/am335x/am3359_cppi41.c
b/sys/arm/ti/am335x/am3359_cppi41.c
index dd5e668776ee..57d049cde8ea 100644
--- a/sys/arm/ti/am335x/am3359_cppi41.c
+++ b/sys/arm/ti/am335x/am3359_cppi41.c
@@ -127,7 +127,6 @@ static int
ti_am3359_cppi41_attach(device_t dev)
{
struct ti_am3359_cppi41_softc *sc;
- phandle_t node;
uint32_t reg, reset_bit, timeout=10;
uint64_t sysc_address;
device_t parent;
@@ -145,7 +144,6 @@ ti_am3359_cppi41_attach(device_t dev)
sc->bsh = rman_get_bushandle(sc->res[0]);
mtx_init(&sc->mtx, device_get_nameunit(sc->dev), NULL, MTX_DEF);
- node = ofw_bus_get_node(sc->dev);
/* variant of am335x_usbss.c */
DPRINTF(dev, "-- RESET USB --\n");
diff --git a/sys/arm/ti/am335x/am335x_musb.c b/sys/arm/ti/am335x/am335x_musb.c
index d868e8a64f8b..2143338a39f7 100644
--- a/sys/arm/ti/am335x/am335x_musb.c
+++ b/sys/arm/ti/am335x/am335x_musb.c
@@ -406,7 +406,6 @@ static int
musbotg_detach(device_t dev)
{
struct musbotg_super_softc *sc = device_get_softc(dev);
- int err;
/* during module unload there are lots of children leftover */
device_delete_children(dev);
@@ -417,7 +416,7 @@ musbotg_detach(device_t dev)
*/
musbotg_uninit(&sc->sc_otg);
- err = bus_teardown_intr(dev, sc->sc_otg.sc_irq_res,
+ bus_teardown_intr(dev, sc->sc_otg.sc_irq_res,
sc->sc_otg.sc_intr_hdl);
sc->sc_otg.sc_intr_hdl = NULL;
}
diff --git a/sys/arm/ti/am335x/am335x_usb_phy.c
b/sys/arm/ti/am335x/am335x_usb_phy.c
index 00e28122dcec..8fb54bd08f11 100644
--- a/sys/arm/ti/am335x/am335x_usb_phy.c
+++ b/sys/arm/ti/am335x/am335x_usb_phy.c
@@ -84,11 +84,9 @@ static int
ti_usb_phy_attach(device_t dev)
{
struct ti_usb_phy_softc *sc;
- phandle_t node;
sc = device_get_softc(dev);
sc->dev = dev;
- node = ofw_bus_get_node(dev);
/* FIXME: Add dev/extres/phy/ interface */
diff --git a/sys/arm/ti/clk/ti_clk_dpll.c b/sys/arm/ti/clk/ti_clk_dpll.c
index ed1c78b19dcb..5a2109b3306d 100644
--- a/sys/arm/ti/clk/ti_clk_dpll.c
+++ b/sys/arm/ti/clk/ti_clk_dpll.c
@@ -76,10 +76,6 @@ struct ti_dpll_clknode_sc {
static int
ti_dpll_clk_init(struct clknode *clk, device_t dev)
{
- struct ti_dpll_clknode_sc *sc;
-
- sc = clknode_get_softc(clk);
-
clknode_init_parent_idx(clk, 0);
return (0);
}
diff --git a/sys/arm/ti/ti_mbox.c b/sys/arm/ti/ti_mbox.c
index f77f2d9eafbf..864b245ad7d1 100644
--- a/sys/arm/ti/ti_mbox.c
+++ b/sys/arm/ti/ti_mbox.c
@@ -224,10 +224,7 @@ ti_mbox_detach(device_t dev)
static void
ti_mbox_intr(void *arg)
{
- struct ti_mbox_softc *sc;
-
- sc = arg;
- DPRINTF("interrupt %p", sc);
+ DPRINTF("interrupt %p", arg);
}
static int
diff --git a/sys/arm/ti/ti_pruss.c b/sys/arm/ti/ti_pruss.c
index a8dc15ab80b0..296c1efa86fc 100644
--- a/sys/arm/ti/ti_pruss.c
+++ b/sys/arm/ti/ti_pruss.c
@@ -520,7 +520,6 @@ ti_pruss_attach(device_t dev)
{
struct ti_pruss_softc *sc;
int rid, i, err, ncells;
- uint32_t reg;
phandle_t node;
clk_t l3_gclk, pruss_ocp_gclk;
phandle_t ti_prm_ref, *cells;
@@ -681,9 +680,6 @@ ti_pruss_attach(device_t dev)
}
}
- reg = ti_pruss_reg_read(sc,
- ti_sysc_get_sysc_address_offset_host(device_get_parent(dev)));
-
if (ti_pruss_reg_read(sc, PRUSS_AM33XX_INTC) == PRUSS_AM33XX_REV)
device_printf(dev, "AM33xx PRU-ICSS\n");
diff --git a/sys/arm/ti/ti_spi.c b/sys/arm/ti/ti_spi.c
index 19b80605b9b6..e51d3de353bd 100644
--- a/sys/arm/ti/ti_spi.c
+++ b/sys/arm/ti/ti_spi.c
@@ -366,11 +366,9 @@ ti_spi_drain_fifo(struct ti_spi_softc *sc)
static void
ti_spi_intr(void *arg)
{
- int eow;
struct ti_spi_softc *sc;
uint32_t status;
- eow = 0;
sc = (struct ti_spi_softc *)arg;
TI_SPI_LOCK(sc);
status = TI_SPI_READ(sc, MCSPI_IRQSTATUS);
@@ -386,9 +384,6 @@ ti_spi_intr(void *arg)
if (status & MCSPI_IRQ_RX0_FULL)
ti_spi_drain_fifo(sc);
- if (status & MCSPI_IRQ_EOW)
- eow = 1;
-
/* Clear interrupt status. */
TI_SPI_WRITE(sc, MCSPI_IRQSTATUS, status);
diff --git a/sys/arm/ti/ti_sysc.c b/sys/arm/ti/ti_sysc.c
index b16158aa5d83..3aad5fd0730d 100644
--- a/sys/arm/ti/ti_sysc.c
+++ b/sys/arm/ti/ti_sysc.c
@@ -400,12 +400,9 @@ ti_sysc_attach_clocks(struct ti_sysc_softc *sc) {
clk_t *clk;
struct clk_list *clkp;
int index, err;
- phandle_t cnode;
clk = malloc(sc->num_clocks*sizeof(clk_t), M_DEVBUF, M_WAITOK | M_ZERO);
- cnode = ofw_bus_get_node(sc->dev);
-
/* Check if all clocks can be found */
for (index = 0; index < sc->num_clocks; index++) {
err = clk_get_by_ofw_index(sc->dev, 0, index, &clk[index]);
