summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Herbrechtsmeier <stefan.herbrechtsmeier@weidmueller.com>2017-01-17 16:27:28 +0100
committerMichal Simek <michal.simek@xilinx.com>2017-02-17 10:22:46 +0100
commitf96fccba7152dac3e83bfe3366932b9d78a98293 (patch)
tree62a14571efcac9d6071e2a16db6c55f474b3986c
parente18c0f667ee9b9aea28e5af4b5ccc5e1ca54d214 (diff)
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>
-rw-r--r--arch/arm/mach-zynq/clk.c12
-rw-r--r--arch/arm/mach-zynq/include/mach/clk.h1
2 files changed, 1 insertions, 12 deletions
diff --git a/arch/arm/mach-zynq/clk.c b/arch/arm/mach-zynq/clk.c
index 7bff964d0b..570ebd73aa 100644
--- a/arch/arm/mach-zynq/clk.c
+++ b/arch/arm/mach-zynq/clk.c
@@ -632,16 +632,6 @@ int zynq_clk_set_rate(enum zynq_clk clk, unsigned long rate)
}
/**
- * 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 250c5bc07b..5c2758aee2 100644
--- 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