zynq: Remove zynq_clk_get_name function

The zynq_clk_get_name function is only used once inside the clock
driver. Replace the function call with the one-line code.

Signed-off-by: Stefan Herbrechtsmeier <stefan.herbrechtsmeier@weidmueller.com>
Reviewed-by: Michal Simek <michal.simek@xilinx.com>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>

diff --git a/arch/arm/mach-zynq/clk.c b/arch/arm/mach-zynq/clk.c
index 7bff964d0b8f7b908cea1ebf8e93b20a9a8ea010..570ebd73aa3a5213d60b48b760198f64100e7fa9 100644 (file)
--- a/arch/arm/mach-zynq/clk.c
+++ b/arch/arm/mach-zynq/clk.c
@@ -631,16 +631,6 @@ int zynq_clk_set_rate(enum zynq_clk clk, unsigned long rate)
        return -ENXIO;
 }
 
-/**
- * zynq_clk_get_name() - Get clock name
- * @clk:       Clock identifier
- * Returns the name of @clk.
- */
-const char *zynq_clk_get_name(enum zynq_clk clk)
-{
-       return clk_names[clk];
-}
-
 /**
  * soc_clk_dump() - Print clock frequencies
  * Returns zero on success
@@ -653,7 +643,7 @@ int soc_clk_dump(void)
 
        printf("clk\t\tfrequency\n");
        for (i = 0; i < clk_max; i++) {
-               const char *name = zynq_clk_get_name(i);
+               const char *name = clk_names[i];
                if (name)
                        printf("%10s%20lu\n", name, zynq_clk_get_rate(i));
        }

diff --git a/arch/arm/mach-zynq/include/mach/clk.h b/arch/arm/mach-zynq/include/mach/clk.h
index 250c5bc07b104fad9969e0f7c019bb50a0634a2d..5c2758aee27406264db07547a7a3b2289ec30784 100644 (file)
--- a/arch/arm/mach-zynq/include/mach/clk.h
+++ b/arch/arm/mach-zynq/include/mach/clk.h
@@ -23,7 +23,6 @@ enum zynq_clk {
 void zynq_clk_early_init(void);
 int zynq_clk_set_rate(enum zynq_clk clk, unsigned long rate);
 unsigned long zynq_clk_get_rate(enum zynq_clk clk);
-const char *zynq_clk_get_name(enum zynq_clk clk);
 unsigned long get_uart_clk(int dev_id);
 
 #endif