clocksource/drivers/ingenic: Rename unreasonable array names

1.Rename the "ingenic_ost_clk_info[]" to "x1000_ost_clk_info[]" to
  facilitate the addition of OST support for X2000 SoC in a later
  commit

2.When the OST support for X2000 SoC is added, there will be two
  compatible strings, so renaming "ingenic_ost_of_match[]" to
  "ingenic_ost_of_matches[]" is more reasonable

3.Remove the unnecessary comma in "ingenic_ost_of_matches[]" to reduce
  code size as much as possible.

Signed-off-by: 周琰杰 (Zhou Yanjie) <zhouyanjie@wanyeetech.com>
Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
Link: https://lore.kernel.org/r/1622824306-30987-2-git-send-email-zhouyanjie@wanyeetech.com

diff --git a/drivers/clocksource/ingenic-sysost.c b/drivers/clocksource/ingenic-sysost.c
index e77d584..a129840 100644 (file)
--- a/drivers/clocksource/ingenic-sysost.c
+++ b/drivers/clocksource/ingenic-sysost.c
@@ -186,7 +186,7 @@ static const struct clk_ops ingenic_ost_global_timer_ops = {
 
 static const char * const ingenic_ost_clk_parents[] = { "ext" };
 
-static const struct ingenic_ost_clk_info ingenic_ost_clk_info[] = {
+static const struct ingenic_ost_clk_info x1000_ost_clk_info[] = {
        [OST_CLK_PERCPU_TIMER] = {
                .init_data = {
                        .name = "percpu timer",
@@ -414,14 +414,14 @@ static const struct ingenic_soc_info x1000_soc_info = {
        .num_channels = 2,
 };
 
-static const struct of_device_id __maybe_unused ingenic_ost_of_match[] __initconst = {
-       { .compatible = "ingenic,x1000-ost", .data = &x1000_soc_info, },
+static const struct of_device_id __maybe_unused ingenic_ost_of_matches[] __initconst = {
+       { .compatible = "ingenic,x1000-ost", .data = &x1000_soc_info },
        { /* sentinel */ }
 };
 
 static int __init ingenic_ost_probe(struct device_node *np)
 {
-       const struct of_device_id *id = of_match_node(ingenic_ost_of_match, np);
+       const struct of_device_id *id = of_match_node(ingenic_ost_of_matches, np);
        struct ingenic_ost *ost;
        unsigned int i;
        int ret;
@@ -462,7 +462,7 @@ static int __init ingenic_ost_probe(struct device_node *np)
        ost->clocks->num = ost->soc_info->num_channels;
 
        for (i = 0; i < ost->clocks->num; i++) {
-               ret = ingenic_ost_register_clock(ost, i, &ingenic_ost_clk_info[i], ost->clocks);
+               ret = ingenic_ost_register_clock(ost, i, &x1000_ost_clk_info[i], ost->clocks);
                if (ret) {
                        pr_crit("%s: Cannot register clock %d\n", __func__, i);
                        goto err_unregister_ost_clocks;