diff options
| author |   Stephen Boyd <sboyd@codeaurora.org> | 2017-11-14 10:07:37 -0800 |
|---|---|---|
| committer | Stephen Boyd <sboyd@codeaurora.org> | 2017-11-14 10:07:37 -0800 |
| commit | 3b0da91688b64290df7b6a31b515a8c903675525 (patch) | |
| tree | 96932b6c80424772ffc4dc047212899bf38ebb4c /drivers/clk | |
| parent | Merge branch 'clk-hikey' into clk-next (diff) | |
| parent | clk: sunxi: explicitly request exclusive reset control (diff) | |
| download | wireguard-linux-3b0da91688b64290df7b6a31b515a8c903675525.tar.xz wireguard-linux-3b0da91688b64290df7b6a31b515a8c903675525.zip | |
Merge branch 'clk-sunxi' into clk-next
* clk-sunxi:
clk: sunxi: explicitly request exclusive reset control
clk: sunxi: fix build warning
Diffstat (limited to 'drivers/clk')
| -rw-r--r-- | drivers/clk/sunxi/clk-factors.c | 2 | ||||
| -rw-r--r-- | drivers/clk/sunxi/clk-sun9i-mmc.c | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/drivers/clk/sunxi/clk-factors.c b/drivers/clk/sunxi/clk-factors.c index dfe5e3e32d28..856fef65433b 100644 --- a/drivers/clk/sunxi/clk-factors.c +++ b/drivers/clk/sunxi/clk-factors.c @@ -276,13 +276,11 @@ void sunxi_factors_unregister(struct device_node *node, struct clk *clk) { struct clk_hw *hw = __clk_get_hw(clk); struct clk_factors *factors; - const char *name; if (!hw) return; factors = to_clk_factors(hw); - name = clk_hw_get_name(hw); of_clk_del_provider(node); /* TODO: The composite clock stuff will leak a bit here. */ diff --git a/drivers/clk/sunxi/clk-sun9i-mmc.c b/drivers/clk/sunxi/clk-sun9i-mmc.c index 6041bdba2e97..a1a634253d6f 100644 --- a/drivers/clk/sunxi/clk-sun9i-mmc.c +++ b/drivers/clk/sunxi/clk-sun9i-mmc.c @@ -124,7 +124,7 @@ static int sun9i_a80_mmc_config_clk_probe(struct platform_device *pdev) return PTR_ERR(data->clk); } - data->reset = devm_reset_control_get(&pdev->dev, NULL); + data->reset = devm_reset_control_get_exclusive(&pdev->dev, NULL); if (IS_ERR(data->reset)) { dev_err(&pdev->dev, "Could not get reset control\n"); return PTR_ERR(data->reset); |