OMAP clock: drop .id field; ensure each clock has a unique name

After the clkdev conversion, the struct clk.id field became
superfluous, so, drop it.  Bring the clock names closer to the TRMs
and ensure they are unique for debugfs.

Signed-off-by: Paul Walmsley <paul@pwsan.com>

2 files changed, 0 insertions, 3 deletions

diff --git a/arch/arm/plat-omap/clock.c b/arch/arm/plat-omap/clock.c
index e3b58afa5dcf..f244b172f9e1 100644
--- a/arch/arm/plat-omap/clock.c
+++ b/arch/arm/plat-omap/clock.c
@@ -408,8 +408,6 @@ static int clk_debugfs_register_one(struct clk *c)
         char *p = s;
 
         p += sprintf(p, "%s", c->name);
-        if (c->id != 0)
-                sprintf(p, ":%d", c->id);
         d = debugfs_create_dir(s, pa ? pa->dent : clk_debugfs_root);
         if (!d)
                 return -ENOMEM;
diff --git a/arch/arm/plat-omap/include/plat/clock.h b/arch/arm/plat-omap/include/plat/clock.h
index 474c21e40eab..bbaba1b64a8a 100644
--- a/arch/arm/plat-omap/include/plat/clock.h
+++ b/arch/arm/plat-omap/include/plat/clock.h
@@ -120,7 +120,6 @@ struct clk {
         struct list_head        node;
         const struct clkops     *ops;
         const char              *name;
-        int                     id;
         struct clk              *parent;
         struct list_head        children;
         struct list_head        sibling;        /* node for children */