[PATCH Resend 1/7] clk: SPEAr: Staticize clk_frac_ops

[PATCH Resend 1/7] clk: SPEAr: Staticize clk_frac_ops

[Sachin Kamat]

clk_frac_ops is local to this file. Make it static.

Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
Acked-by: Viresh Kumar <viresh.kumar@linaro.org>
---
 drivers/clk/spear/clk-frac-synth.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/clk/spear/clk-frac-synth.c b/drivers/clk/spear/clk-frac-synth.c
index 958aa3ad1d60..dffd4ce6c8b5 100644
--- a/drivers/clk/spear/clk-frac-synth.c
+++ b/drivers/clk/spear/clk-frac-synth.c
@@ -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,
-- 
1.7.9.5

[PATCH Resend 2/7] clk: tegra: Staticize tegra_clk_periph_nodiv_ops

[Sachin Kamat]

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

Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
---
 drivers/clk/tegra/clk-periph.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/clk/tegra/clk-periph.c b/drivers/clk/tegra/clk-periph.c
index c534043c0481..356e9b804421 100644
--- a/drivers/clk/tegra/clk-periph.c
+++ b/drivers/clk/tegra/clk-periph.c
@@ -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,
-- 
1.7.9.5

[PATCH Resend 2/7] clk: tegra: Staticize tegra_clk_periph_nodiv_ops

[Stephen Warren]

On 12/19/2013 01:53 AM, Sachin Kamat wrote:
> 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.

> 
> Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
> ---
>  drivers/clk/tegra/clk-periph.c |    2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/clk/tegra/clk-periph.c b/drivers/clk/tegra/clk-periph.c
> index c534043c0481..356e9b804421 100644
> --- a/drivers/clk/tegra/clk-periph.c
> +++ b/drivers/clk/tegra/clk-periph.c
> @@ -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,
> 

[PATCH Resend 2/7] clk: tegra: Staticize tegra_clk_periph_nodiv_ops

[Peter De Schrijver]

On Thu, Dec 19, 2013 at 06:01:19PM +0100, Stephen Warren wrote:
> On 12/19/2013 01:53 AM, Sachin Kamat wrote:
> > 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.

[PATCH Resend 3/7] clk: socfpga: Use NULL instead of 0

[Sachin Kamat]

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

Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
Acked-by: Dinh Nguyen <dinguyen@altera.com>
---
 drivers/clk/socfpga/clk.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/clk/socfpga/clk.c b/drivers/clk/socfpga/clk.c
index c3784899f002..5983a26a8c5f 100644
--- a/drivers/clk/socfpga/clk.c
+++ b/drivers/clk/socfpga/clk.c
@@ -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);
-- 
1.7.9.5

[PATCH Resend 4/7] clk: versatile: Staticize clk_sp810_timerclken_of_get

[Sachin Kamat]

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

Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
---
 drivers/clk/versatile/clk-sp810.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/clk/versatile/clk-sp810.c b/drivers/clk/versatile/clk-sp810.c
index bf9b15a585e1..c6e86a9a2aa3 100644
--- a/drivers/clk/versatile/clk-sp810.c
+++ b/drivers/clk/versatile/clk-sp810.c
@@ -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;
-- 
1.7.9.5

[PATCH Resend 5/7] clk: vt8500: Staticize vtwm_pll_ops

[Sachin Kamat]

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

Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
Cc: Tony Prisk <linux@prisktech.co.nz>
---
 drivers/clk/clk-vt8500.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/clk/clk-vt8500.c b/drivers/clk/clk-vt8500.c
index 7fd5c5e9e25d..37e928846ec5 100644
--- a/drivers/clk/clk-vt8500.c
+++ b/drivers/clk/clk-vt8500.c
@@ -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,
-- 
1.7.9.5

[PATCH Resend 5/7] clk: vt8500: Staticize vtwm_pll_ops

[Tony Prisk]

On 19/12/13 21:53, Sachin Kamat wrote:
> 'vtwm_pll_ops' is local to this file. Make it static.
>
> Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
> Cc: Tony Prisk <linux@prisktech.co.nz>
> ---
>   drivers/clk/clk-vt8500.c |    2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/clk/clk-vt8500.c b/drivers/clk/clk-vt8500.c
> index 7fd5c5e9e25d..37e928846ec5 100644
> --- a/drivers/clk/clk-vt8500.c
> +++ b/drivers/clk/clk-vt8500.c
> @@ -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:

Acked-by: Tony Prisk <linux@prisktech.co.nz>

Regards
Tony Prisk

[PATCH Resend 6/7] clk: ux500: Remove extra semicolon

[Sachin Kamat]

Extra semicolon is redundant. Remove it.

Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
Acked-by: Ulf Hansson <ulf.hansson@linaro.org>
---
 drivers/clk/ux500/clk-prcmu.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/clk/ux500/clk-prcmu.c b/drivers/clk/ux500/clk-prcmu.c
index 293a28854417..e2d63bc47436 100644
--- a/drivers/clk/ux500/clk-prcmu.c
+++ b/drivers/clk/ux500/clk-prcmu.c
@@ -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

[PATCH Resend 6/7] clk: ux500: Remove extra semicolon

[Ulf Hansson]

On 19 December 2013 09:54, Sachin Kamat <sachin.kamat@linaro.org> wrote:
> Extra semicolon is redundant. Remove it.
>
> Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
> Acked-by: Ulf Hansson <ulf.hansson@linaro.org>

Applied to my clk-next-ux500 branch.

Thanks!
Ulf Hansson

> ---
>  drivers/clk/ux500/clk-prcmu.c |    2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/clk/ux500/clk-prcmu.c b/drivers/clk/ux500/clk-prcmu.c
> index 293a28854417..e2d63bc47436 100644
> --- a/drivers/clk/ux500/clk-prcmu.c
> +++ b/drivers/clk/ux500/clk-prcmu.c
> @@ -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

[PATCH Resend 7/7] clk: max77686: Remove redundant break

[Sachin Kamat]

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

Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
Cc: Jonghwa Lee <jonghwa3.lee@samsung.com>
---
 drivers/clk/clk-max77686.c |    2 --
 1 file changed, 2 deletions(-)

diff --git a/drivers/clk/clk-max77686.c b/drivers/clk/clk-max77686.c
index 9f57bc37cd60..b4a1a9719ab0 100644
--- a/drivers/clk/clk-max77686.c
+++ b/drivers/clk/clk-max77686.c
@@ -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;
-- 
1.7.9.5

[PATCH Resend 7/7] clk: max77686: Remove redundant break

[jonghwa3.lee at samsung.com]

On 2013? 12? 19? 17:54, Sachin Kamat wrote:

> 'break' after 'goto' is redundant. Remove it.
> 
> Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
> Cc: Jonghwa Lee <jonghwa3.lee@samsung.com>
> ---
>  drivers/clk/clk-max77686.c |    2 --
>  1 file changed, 2 deletions(-)
> 
> diff --git a/drivers/clk/clk-max77686.c b/drivers/clk/clk-max77686.c
> index 9f57bc37cd60..b4a1a9719ab0 100644
> --- a/drivers/clk/clk-max77686.c
> +++ b/drivers/clk/clk-max77686.c
> @@ -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;


Acked-by: Jonghwa Lee <jonghwa3.lee@samsung.com>


Thanks,
Jonghwa