D36533.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D36533.diff
View Options

	diff --git a/sys/dev/qcom_clk/qcom_clk_apssdiv.c b/sys/dev/qcom_clk/qcom_clk_apssdiv.c
	--- a/sys/dev/qcom_clk/qcom_clk_apssdiv.c
	+++ b/sys/dev/qcom_clk/qcom_clk_apssdiv.c
	@@ -131,9 +131,6 @@
	static int
	qcom_clk_apssdiv_init(struct clknode *clk, device_t dev)
	{
	- struct qcom_clk_apssdiv_sc *sc;
	-
	- sc = clknode_get_softc(clk);

	/*
	* There's only a single parent here for an fixed divisor,
	diff --git a/sys/dev/qcom_clk/qcom_clk_rcg2.c b/sys/dev/qcom_clk/qcom_clk_rcg2.c
	--- a/sys/dev/qcom_clk/qcom_clk_rcg2.c
	+++ b/sys/dev/qcom_clk/qcom_clk_rcg2.c
	@@ -265,7 +265,7 @@
	struct qcom_clk_rcg2_sc *sc;
	uint32_t reg;
	uint32_t idx;
	- bool enabled;
	+ bool enabled __unused;

	sc = clknode_get_softc(clk);

	@@ -282,6 +282,7 @@
	enabled = false;
	else
	enabled = true;
	+
	/* mux settings */
	CLKDEV_READ_4(clknode_get_device(sc->clknode),
	QCOM_CLK_RCG2_CFG_OFFSET(sc), &reg);
	@@ -289,8 +290,9 @@

	idx = (reg & QCOM_CLK_RCG2_CFG_SRC_SEL_MASK)
	>> QCOM_CLK_RCG2_CFG_SRC_SEL_SHIFT;
	- DPRINTF(clknode_get_device(sc->clknode), "%s: mux index %u\n",
	- __func__, idx);
	+ DPRINTF(clknode_get_device(sc->clknode),
	+ "%s: mux index %u, enabled=%d\n",
	+ __func__, idx, enabled);
	clknode_init_parent_idx(clk, idx);

	/*