1
0

503-clk-mvebu-armada-37xx-periph-cosmetic-changes.patch 2.6 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778
  1. From adf4e289dd7f801c3fe12e0e6b491e11e548cd3d Mon Sep 17 00:00:00 2001
  2. From: Gregory CLEMENT <gregory.clement@free-electrons.com>
  3. Date: Thu, 30 Nov 2017 14:40:27 +0100
  4. Subject: clk: mvebu: armada-37xx-periph: cosmetic changes
  5. This patches fixes few cosmetic issues such as alignment, blank lines
  6. and required space.
  7. Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
  8. Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
  9. ---
  10. drivers/clk/mvebu/armada-37xx-periph.c | 17 +++++++++--------
  11. 1 file changed, 9 insertions(+), 8 deletions(-)
  12. --- a/drivers/clk/mvebu/armada-37xx-periph.c
  13. +++ b/drivers/clk/mvebu/armada-37xx-periph.c
  14. @@ -79,6 +79,7 @@ static const struct clk_div_table clk_ta
  15. { .val = 1, .div = 4, },
  16. { .val = 0, .div = 0, }, /* last entry */
  17. };
  18. +
  19. static const struct clk_ops clk_double_div_ops;
  20. #define PERIPH_GATE(_name, _bit) \
  21. @@ -217,7 +218,7 @@ PERIPH_CLK_FULL(counter, 23, 20, DIV_SEL
  22. PERIPH_CLK_FULL_DD(eip97, 24, 24, DIV_SEL2, DIV_SEL2, 22, 19);
  23. PERIPH_CLK_MUX_DIV(cpu, 22, DIV_SEL0, 28, clk_table6);
  24. -static struct clk_periph_data data_nb[] ={
  25. +static struct clk_periph_data data_nb[] = {
  26. REF_CLK_FULL_DD(mmc),
  27. REF_CLK_FULL_DD(sata_host),
  28. REF_CLK_FULL_DD(sec_at),
  29. @@ -281,7 +282,7 @@ static unsigned int get_div(void __iomem
  30. }
  31. static unsigned long clk_double_div_recalc_rate(struct clk_hw *hw,
  32. - unsigned long parent_rate)
  33. + unsigned long parent_rate)
  34. {
  35. struct clk_double_div *double_div = to_clk_double_div(hw);
  36. unsigned int div;
  37. @@ -303,6 +304,7 @@ static const struct of_device_id armada_
  38. .data = data_sb, },
  39. { }
  40. };
  41. +
  42. static int armada_3700_add_composite_clk(const struct clk_periph_data *data,
  43. void __iomem *reg, spinlock_t *lock,
  44. struct device *dev, struct clk_hw **hw)
  45. @@ -355,9 +357,9 @@ static int armada_3700_add_composite_clk
  46. }
  47. *hw = clk_hw_register_composite(dev, data->name, data->parent_names,
  48. - data->num_parents, mux_hw,
  49. - mux_ops, rate_hw, rate_ops,
  50. - gate_hw, gate_ops, CLK_IGNORE_UNUSED);
  51. + data->num_parents, mux_hw,
  52. + mux_ops, rate_hw, rate_ops,
  53. + gate_hw, gate_ops, CLK_IGNORE_UNUSED);
  54. if (IS_ERR(*hw))
  55. return PTR_ERR(*hw);
  56. @@ -406,12 +408,11 @@ static int armada_3700_periph_clock_prob
  57. if (armada_3700_add_composite_clk(&data[i], reg,
  58. &driver_data->lock, dev, hw))
  59. dev_err(dev, "Can't register periph clock %s\n",
  60. - data[i].name);
  61. -
  62. + data[i].name);
  63. }
  64. ret = of_clk_add_hw_provider(np, of_clk_hw_onecell_get,
  65. - driver_data->hw_data);
  66. + driver_data->hw_data);
  67. if (ret) {
  68. for (i = 0; i < num_periph; i++)
  69. clk_hw_unregister(driver_data->hw_data->hws[i]);