Skip to contentSkip to conversation

clk: SPEAr: Staticize clk_frac_ops

PATCH RESEND New Sachin Kamat 6 participants 12 messages Dec 19, 2013 – Dec 23, 2013

Subsystems (8)
lore
Share & tools
lore
#0 lore raw

PATCH RESEND 1/7 clk: SPEAr: Staticize clk_frac_ops

clk_frac_ops is local to this file. Make it static.

---
 drivers/clk/spear/clk-frac-synth.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/clk/spear/clk-frac-synth.c +1 -1
index 958aa3ad1d60..dffd4ce6c8b5 100644
@@ -116,7 +116,7 @@ static int clk_frac_set_rate(struct clk_hw *hw, unsigned long drate,
 	return 0;
 }
 
-struct clk_ops clk_frac_ops = {
+static struct clk_ops clk_frac_ops = {
 	.recalc_rate = clk_frac_recalc_rate,
 	.round_rate = clk_frac_round_rate,
 	.set_rate = clk_frac_set_rate,
Signature · 1 line
1.7.9.5
#1 lore raw

PATCH RESEND 2/7 clk: tegra: Staticize tegra_clk_periph_nodiv_ops

tegra_clk_periph_nodiv_ops is used only in this file. Make it static.

---
 drivers/clk/tegra/clk-periph.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/clk/tegra/clk-periph.c +1 -1
index c534043c0481..356e9b804421 100644
@@ -122,7 +122,7 @@ const struct clk_ops tegra_clk_periph_ops = {
 	.disable = clk_periph_disable,
 };
 
-const struct clk_ops tegra_clk_periph_nodiv_ops = {
+static const struct clk_ops tegra_clk_periph_nodiv_ops = {
 	.get_parent = clk_periph_get_parent,
 	.set_parent = clk_periph_set_parent,
 	.is_enabled = clk_periph_is_enabled,
Signature · 1 line
1.7.9.5
#2 lore raw

PATCH RESEND 2/7 clk: tegra: Staticize tegra_clk_periph_nodiv_ops

Quoted 1 line · Sachin Kamat

tegra_clk_periph_nodiv_ops is used only in this file. Make it static.

I believe that Peter De Schrijver is picking up patches for drivers/clk/tegra and sending pull requests to Mike. Hence, I'm CC'ing him in here.

Quoted 20 lines
---
 drivers/clk/tegra/clk-periph.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/clk/tegra/clk-periph.c +1 -1
index c534043c0481..356e9b804421 100644
@@ -122,7 +122,7 @@ const struct clk_ops tegra_clk_periph_ops = {
 	.disable = clk_periph_disable,
 };
 
-const struct clk_ops tegra_clk_periph_nodiv_ops = {
+static const struct clk_ops tegra_clk_periph_nodiv_ops = {
 	.get_parent = clk_periph_get_parent,
 	.set_parent = clk_periph_set_parent,
 	.is_enabled = clk_periph_is_enabled,
#3 lore raw

PATCH RESEND 2/7 clk: tegra: Staticize tegra_clk_periph_nodiv_ops

Quoted 7 lines · Stephen Warren
Quoted 1 line · Sachin Kamat

tegra_clk_periph_nodiv_ops is used only in this file. Make it static.

I believe that Peter De Schrijver is picking up patches for drivers/clk/tegra and sending pull requests to Mike. Hence, I'm CC'ing him in here.

This seems to be already merged in next-20131223 as 4e100354e5b7c8982d1563dca134d375979a8ead

Cheers,

Peter.

#4 lore raw

PATCH RESEND 3/7 clk: socfpga: Use NULL instead of 0

In reply to Sachin Kamat

'div_reg' is a pointer. Assign NULL instead of 0.

---
 drivers/clk/socfpga/clk.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/clk/socfpga/clk.c +1 -1
index c3784899f002..5983a26a8c5f 100644
@@ -290,7 +290,7 @@ static void __init socfpga_gate_clk_init(struct device_node *node,
 		socfpga_clk->shift = div_reg[1];
 		socfpga_clk->width = div_reg[2];
 	} else {
-		socfpga_clk->div_reg = 0;
+		socfpga_clk->div_reg = NULL;
 	}
 
 	of_property_read_string(node, "clock-output-names", &clk_name);
Signature · 1 line
1.7.9.5
#5 lore raw

PATCH RESEND 4/7 clk: versatile: Staticize clk_sp810_timerclken_of_get

In reply to Sachin Kamat

clk_sp810_timerclken_of_get is used only in this file. Make it static.

---
 drivers/clk/versatile/clk-sp810.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/clk/versatile/clk-sp810.c +1 -1
index bf9b15a585e1..c6e86a9a2aa3 100644
@@ -123,7 +123,7 @@ static const struct clk_ops clk_sp810_timerclken_ops = {
 	.set_parent = clk_sp810_timerclken_set_parent,
 };
 
-struct clk *clk_sp810_timerclken_of_get(struct of_phandle_args *clkspec,
+static struct clk *clk_sp810_timerclken_of_get(struct of_phandle_args *clkspec,
 		void *data)
 {
 	struct clk_sp810 *sp810 = data;
Signature · 1 line
1.7.9.5
#6 lore raw

PATCH RESEND 5/7 clk: vt8500: Staticize vtwm_pll_ops

In reply to Sachin Kamat

'vtwm_pll_ops' is local to this file. Make it static.

---
 drivers/clk/clk-vt8500.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/clk/clk-vt8500.c +1 -1
index 7fd5c5e9e25d..37e928846ec5 100644
@@ -641,7 +641,7 @@ static unsigned long vtwm_pll_recalc_rate(struct clk_hw *hw,
 	return pll_freq;
 }
 
-const struct clk_ops vtwm_pll_ops = {
+static const struct clk_ops vtwm_pll_ops = {
 	.round_rate = vtwm_pll_round_rate,
 	.set_rate = vtwm_pll_set_rate,
 	.recalc_rate = vtwm_pll_recalc_rate,
Signature · 1 line
1.7.9.5
#7 lore raw

PATCH RESEND 5/7 clk: vt8500: Staticize vtwm_pll_ops

Quoted 13 lines · Sachin Kamat

'vtwm_pll_ops' is local to this file. Make it static.

---
  drivers/clk/clk-vt8500.c |    2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
drivers/clk/clk-vt8500.c +0 -0
index 7fd5c5e9e25d..37e928846ec5 100644

drivers/clk/clk-vt8500.c static unsigned long vtwm_pll_recalc_rate(struct clk_hw *hw, · line 647

Quoted 8 lines
drivers/clk/clk-vt8500.c +1 -1
@@ -641,7 +641,7 @@ static unsigned long vtwm_pll_recalc_rate(struct clk_hw *hw,
  	return pll_freq;
  }
 
-const struct clk_ops vtwm_pll_ops = {
+static const struct clk_ops vtwm_pll_ops = {
  	.round_rate = vtwm_pll_round_rate,
  	.set_rate = vtwm_pll_set_rate,
  	.recalc_rate = vtwm_pll_recalc_rate,

I thought I had already ack'd this but if not:

Regards
Tony Prisk

#8 lore raw

PATCH RESEND 6/7 clk: ux500: Remove extra semicolon

In reply to Sachin Kamat

Extra semicolon is redundant. Remove it.

---
 drivers/clk/ux500/clk-prcmu.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/clk/ux500/clk-prcmu.c +1 -1
index 293a28854417..e2d63bc47436 100644
@@ -36,7 +36,7 @@ static int clk_prcmu_prepare(struct clk_hw *hw)
 	if (!ret)
 		clk->is_prepared = 1;
 
-	return ret;;
+	return ret;
 }
 
 static void clk_prcmu_unprepare(struct clk_hw *hw)
Signature · 1 line
1.7.9.5
Applied
#9 lore raw

PATCH RESEND 6/7 clk: ux500: Remove extra semicolon

Quoted 4 lines · Sachin Kamat

Extra semicolon is redundant. Remove it.

Applied to my clk-next-ux500 branch.

Thanks!
Ulf Hansson

Quoted 25 lines
---
 drivers/clk/ux500/clk-prcmu.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/clk/ux500/clk-prcmu.c +1 -2
index 293a28854417..e2d63bc47436 100644
@@ -36,7 +36,7 @@ static int clk_prcmu_prepare(struct clk_hw *hw)
        if (!ret)
                clk->is_prepared = 1;
 
-       return ret;;
+       return ret;
 }
 
 static void clk_prcmu_unprepare(struct clk_hw *hw)
--

1.7.9.5

_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel at lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

#10 lore raw

PATCH RESEND 7/7 clk: max77686: Remove redundant break

In reply to Sachin Kamat

'break' after 'goto' is redundant. Remove it.

---
 drivers/clk/clk-max77686.c |    2 --
 1 file changed, 2 deletions(-)
drivers/clk/clk-max77686.c +0 -2
index 9f57bc37cd60..b4a1a9719ab0 100644
@@ -157,11 +157,9 @@ static int max77686_clk_probe(struct platform_device *pdev)
 			case MAX77686_CLK_AP:
 				dev_err(&pdev->dev, "Fail to register CLK_AP\n");
 				goto err_clk_ap;
-				break;
 			case MAX77686_CLK_CP:
 				dev_err(&pdev->dev, "Fail to register CLK_CP\n");
 				goto err_clk_cp;
-				break;
 			case MAX77686_CLK_PMIC:
 				dev_err(&pdev->dev, "Fail to register CLK_PMIC\n");
 				goto err_clk_pmic;
Signature · 1 line
1.7.9.5
#11 lore raw

PATCH RESEND 7/7 clk: max77686: Remove redundant break

Quoted 14 lines · Sachin Kamat

'break' after 'goto' is redundant. Remove it.

---
 drivers/clk/clk-max77686.c |    2 --
 1 file changed, 2 deletions(-)
drivers/clk/clk-max77686.c +0 -0
index 9f57bc37cd60..b4a1a9719ab0 100644
@@ -157,11 +157,9 @@ static int max77686_clk_probe(struct platform_device *pdev)
 			case MAX77686_CLK_AP:

drivers/clk/clk-max77686.c static int max77686_clk_probe(struct platform_device *pdev) · line 165

Quoted 10 lines
drivers/clk/clk-max77686.c +0 -2
 				dev_err(&pdev->dev, "Fail to register CLK_AP\n");
 				goto err_clk_ap;
-				break;
 			case MAX77686_CLK_CP:
 				dev_err(&pdev->dev, "Fail to register CLK_CP\n");
 				goto err_clk_cp;
-				break;
 			case MAX77686_CLK_PMIC:
 				dev_err(&pdev->dev, "Fail to register CLK_PMIC\n");
 				goto err_clk_pmic;

Thanks,
Jonghwa