The branch main has been updated by jhb:

URL: 
https://cgit.FreeBSD.org/src/commit/?id=c16bfb03cb834fb4b5ae43271f9aec1feab2782b

commit c16bfb03cb834fb4b5ae43271f9aec1feab2782b
Author:     John Baldwin <j...@freebsd.org>
AuthorDate: 2022-04-09 01:31:29 +0000
Commit:     John Baldwin <j...@freebsd.org>
CommitDate: 2022-04-09 01:31:29 +0000

    arm mv: Remove unused variables.
---
 sys/arm/mv/clk/periph_clk_d.c        | 8 --------
 sys/arm/mv/clk/periph_clk_fixed.c    | 2 --
 sys/arm/mv/clk/periph_clk_gate.c     | 3 ---
 sys/arm/mv/clk/periph_clk_mux_gate.c | 4 ----
 sys/arm/mv/mv_ap806_sei.c            | 3 ---
 sys/arm/mv/mv_pci.c                  | 4 ++--
 sys/arm/mv/mv_thermal.c              | 6 ------
 sys/arm/mv/mvebu_pinctrl.c           | 3 ---
 8 files changed, 2 insertions(+), 31 deletions(-)

diff --git a/sys/arm/mv/clk/periph_clk_d.c b/sys/arm/mv/clk/periph_clk_d.c
index 4c16b9b5a2ac..007bec14fe11 100644
--- a/sys/arm/mv/clk/periph_clk_d.c
+++ b/sys/arm/mv/clk/periph_clk_d.c
@@ -68,11 +68,9 @@ a37x0_periph_d_register_full_clk_dd(struct clkdom *clkdom,
        struct clk_gate_def *gate;
        struct clk_div_def *div1;
        struct clk_div_def *div2;
-       const char *dev_name;
        int error, dev_id;
 
        dev_id = device_def->common_def.device_id;
-       dev_name = device_def->common_def.device_name;
        tbg_mux = &device_def->clk_def.full_dd.tbg_mux;
        div1 = &device_def->clk_def.full_dd.div1;
        div2 = &device_def->clk_def.full_dd.div2;
@@ -134,11 +132,9 @@ a37x0_periph_d_register_full_clk(struct clkdom *clkdom,
        struct clk_mux_def *clk_mux;
        struct clk_gate_def *gate;
        struct clk_div_def *div;
-       const char *dev_name;
        int error, dev_id;
 
        dev_id = device_def->common_def.device_id;
-       dev_name = device_def->common_def.device_name;
        tbg_mux = &device_def->clk_def.full_d.tbg_mux;
        div = &device_def->clk_def.full_d.div;
        gate = &device_def->clk_def.full_d.gate;
@@ -190,10 +186,8 @@ a37x0_periph_d_register_periph_cpu(struct clkdom *clkdom,
        struct clk_mux_def *clk_mux;
        struct clk_mux_def *tbg_mux;
        struct clk_div_def *div;
-       const char *dev_name;
        int error, dev_id;
 
-       dev_name = device_def->common_def.device_name;
        dev_id = device_def->common_def.device_id;
        tbg_mux = &device_def->clk_def.cpu.tbg_mux;
        div = &device_def->clk_def.cpu.div;
@@ -237,10 +231,8 @@ a37x0_periph_d_register_mdd(struct clkdom *clkdom,
        struct clk_mux_def *clk_mux;
        struct clk_div_def *div1;
        struct clk_div_def *div2;
-       const char * dev_name;
        int error, dev_id;
 
-       dev_name = device_def->common_def.device_name;
        dev_id = device_def->common_def.device_id;
        tbg_mux = &device_def->clk_def.mdd.tbg_mux;
        div1 = &device_def->clk_def.mdd.div1;
diff --git a/sys/arm/mv/clk/periph_clk_fixed.c 
b/sys/arm/mv/clk/periph_clk_fixed.c
index 4482646455ef..eac27048c0ee 100644
--- a/sys/arm/mv/clk/periph_clk_fixed.c
+++ b/sys/arm/mv/clk/periph_clk_fixed.c
@@ -65,10 +65,8 @@ a37x0_periph_fixed_register_fixed(struct clkdom *clkdom,
        struct clk_fixed_def fixed_def;
        struct clk_gate_def *gate;
        struct clk_mux_def *mux;
-       const char *dev_name;
        int error, dev_id;
 
-       dev_name = device_def->common_def.device_name;
        dev_id = device_def->common_def.device_id;
        mux = &device_def->clk_def.fixed.mux;
        gate = &device_def->clk_def.fixed.gate;
diff --git a/sys/arm/mv/clk/periph_clk_gate.c b/sys/arm/mv/clk/periph_clk_gate.c
index 9037b3147b35..89e6fe44d27b 100644
--- a/sys/arm/mv/clk/periph_clk_gate.c
+++ b/sys/arm/mv/clk/periph_clk_gate.c
@@ -60,12 +60,9 @@ a37x0_periph_gate_register_gate(struct clkdom *clkdom,
 {
        struct clk_gate_def *gate;
        const char *parent_name;
-       const char *dev_name;
        int error, dev_id;
 
        dev_id = device_def->common_def.device_id;
-       dev_name = device_def->common_def.device_name;
-
        gate = &device_def->clk_def.gate.gate;
 
        if (device_def->common_def.pname == NULL)
diff --git a/sys/arm/mv/clk/periph_clk_mux_gate.c 
b/sys/arm/mv/clk/periph_clk_mux_gate.c
index fd56c2b1e802..c569ea3fcfdb 100644
--- a/sys/arm/mv/clk/periph_clk_mux_gate.c
+++ b/sys/arm/mv/clk/periph_clk_mux_gate.c
@@ -66,10 +66,8 @@ a37x0_periph_register_mux_gate(struct clkdom *clkdom,
        struct clk_fixed_def fixed;
        struct clk_gate_def *gate;
        struct clk_mux_def *mux;
-       const char *dev_name;
        int error, dev_id;
 
-       dev_name = device_def->common_def.device_name;
        dev_id = device_def->common_def.device_id;
        mux = &device_def->clk_def.mux_gate.mux;
        gate = &device_def->clk_def.mux_gate.gate;
@@ -120,10 +118,8 @@ a37x0_periph_register_mux_gate_fixed(struct clkdom * 
clkdom,
        const char *parent_names[PARENT_CNT];
        struct clk_gate_def *gate;
        struct clk_mux_def *mux;
-       const char *dev_name;
        int error, dev_id;
 
-       dev_name = device_def->common_def.device_name;
        dev_id = device_def->common_def.device_id;
        mux = &device_def->clk_def.mux_gate_fixed.mux;
        gate = &device_def->clk_def.mux_gate_fixed.gate;
diff --git a/sys/arm/mv/mv_ap806_sei.c b/sys/arm/mv/mv_ap806_sei.c
index fad57dcad17f..7d6291cae5ba 100644
--- a/sys/arm/mv/mv_ap806_sei.c
+++ b/sys/arm/mv/mv_ap806_sei.c
@@ -160,12 +160,9 @@ mv_ap806_sei_disable_intr(device_t dev, struct intr_irqsrc 
*isrc)
 static int
 mv_ap806_sei_map(device_t dev, struct intr_map_data *data, u_int *irqp)
 {
-       struct mv_ap806_sei_softc *sc;
        struct intr_map_data_fdt *daf;
        u_int irq;
 
-       sc = device_get_softc(dev);
-
        if (data->type != INTR_MAP_DATA_FDT)
                return (ENOTSUP);
 
diff --git a/sys/arm/mv/mv_pci.c b/sys/arm/mv/mv_pci.c
index 4c8da7dc7582..7b7dc9111c2b 100644
--- a/sys/arm/mv/mv_pci.c
+++ b/sys/arm/mv/mv_pci.c
@@ -121,7 +121,7 @@ mv_pci_ranges_decode(phandle_t node, struct mv_pci_range 
*io_space,
        struct mv_pci_range *pci_space;
        pcell_t addr_cells, size_cells, par_addr_cells;
        pcell_t *rangesptr;
-       pcell_t cell0, cell1, cell2;
+       pcell_t cell0, cell2;
        int tuple_size, tuples, i, rv, offset_cells, len;
        int  portid, is_io_space;
 
@@ -161,7 +161,7 @@ mv_pci_ranges_decode(phandle_t node, struct mv_pci_range 
*io_space,
        for (i = 0; i < tuples; i++) {
                cell0 = fdt_data_get((void *)rangesptr, 1);
                rangesptr++;
-               cell1 = fdt_data_get((void *)rangesptr, 1);
+               /* cell1 */
                rangesptr++;
                cell2 = fdt_data_get((void *)rangesptr, 1);
                rangesptr++;
diff --git a/sys/arm/mv/mv_thermal.c b/sys/arm/mv/mv_thermal.c
index ed47f25a40c1..05000b9e06db 100644
--- a/sys/arm/mv/mv_thermal.c
+++ b/sys/arm/mv/mv_thermal.c
@@ -298,14 +298,12 @@ mv_thermal_attach(device_t dev)
        struct mv_thermal_softc *sc;
        struct sysctl_ctx_list *ctx;
        struct sysctl_oid_list *oid;
-       phandle_t node;
        char name[255];
        char desc[255];
        int i;
 
        sc = device_get_softc(dev);
        sc->dev = dev;
-       node = ofw_bus_get_node(dev);
 
        sc->config = (struct mv_thermal_config *)
            ofw_bus_search_compatible(dev, compat_data)->ocd_data;
@@ -353,10 +351,6 @@ mv_thermal_attach(device_t dev)
 static int
 mv_thermal_detach(device_t dev)
 {
-       struct mv_thermal_softc *sc;
-
-       sc = device_get_softc(dev);
-
        return (0);
 }
 
diff --git a/sys/arm/mv/mvebu_pinctrl.c b/sys/arm/mv/mvebu_pinctrl.c
index 930c6878370f..e43c5a41d3a0 100644
--- a/sys/arm/mv/mvebu_pinctrl.c
+++ b/sys/arm/mv/mvebu_pinctrl.c
@@ -187,7 +187,6 @@ static int
 mv_pinctrl_attach(device_t dev)
 {
        struct mv_pinctrl_softc *sc;
-       phandle_t node;
 
        sc = device_get_softc(dev);
        sc->dev = dev;
@@ -200,8 +199,6 @@ mv_pinctrl_attach(device_t dev)
                return (ENXIO);
        }
 
-       node = ofw_bus_get_node(dev);
-
        fdt_pinctrl_register(dev, "marvell,pins");
        fdt_pinctrl_configure_tree(dev);
 

Reply via email to