ARM: OMAP: hwmod: remove code support for direct hwmod registration

Now that the data has been converted to use interface registration, we
can remove the (now unused) direct hwmod registration code.

Signed-off-by: Paul Walmsley <paul@pwsan.com>
Cc: Benoît Cousson <b-cousson@ti.com>

2 files changed, 33 insertions, 98 deletions

diff --git a/arch/arm/mach-omap2/omap_hwmod.c b/arch/arm/mach-omap2/omap_hwmod.c
index 99b913aa0cb9..bf86f7e8f91f 100644
--- a/arch/arm/mach-omap2/omap_hwmod.c
+++ b/arch/arm/mach-omap2/omap_hwmod.c
@@ -173,12 +173,6 @@ static LIST_HEAD(omap_hwmod_list);
 static struct omap_hwmod *mpu_oh;
 
 /*
- * link_registration: set to true if hwmod interfaces are being registered
- * directly; set to false if hwmods are being registered directly
- */
-static bool link_registration;
-
-/*
  * linkspace: ptr to a buffer that struct omap_hwmod_link records are
  * allocated from - used to reduce the number of small memory
  * allocations, which has a significant impact on performance
@@ -195,32 +189,22 @@ static unsigned short free_ls, max_ls, ls_supp;
 /* Private functions */
 
 /**
- * _fetch_next_ocp_if - return next OCP interface in an array or list
+ * _fetch_next_ocp_if - return the next OCP interface in a list
  * @p: ptr to a ptr to the list_head inside the ocp_if to return
- * @old: ptr to an array of struct omap_hwmod_ocp_if records
- * @i: pointer to the index into the @old array
- *
- * Return a pointer to the next struct omap_hwmod_ocp_if record in a
- * sequence.  If hwmods are being registered directly, then return a
- * struct omap_hwmod_ocp_if record corresponding to the element index
- * pointed to by @i in the
- * @old array.  Otherwise, return a pointer to the struct
- * omap_hwmod_ocp_if record containing the struct list_head record pointed
- * to by @p, and set the pointer pointed to by @p to point to the next
- * struct list_head record in the list.
+ * @i: pointer to the index of the element pointed to by @p in the list
+ *
+ * Return a pointer to the struct omap_hwmod_ocp_if record
+ * containing the struct list_head pointed to by @p, and increment
+ * @p such that a future call to this routine will return the next
+ * record.
  */
 static struct omap_hwmod_ocp_if *_fetch_next_ocp_if(struct list_head **p,
-                                                    struct omap_hwmod_ocp_if **old,
                                                     int *i)
 {
         struct omap_hwmod_ocp_if *oi;
 
-        if (!link_registration) {
-                oi = old[*i];
-        } else {
-                oi = list_entry(*p, struct omap_hwmod_link, node)->ocp_if;
-                *p = (*p)->next;
-        }
+        oi = list_entry(*p, struct omap_hwmod_link, node)->ocp_if;
+        *p = (*p)->next;
 
         *i = *i + 1;
 
@@ -642,16 +626,15 @@ static int _init_main_clk(struct omap_hwmod *oh)
 static int _init_interface_clks(struct omap_hwmod *oh)
 {
         struct omap_hwmod_ocp_if *os;
-        struct list_head *p = NULL;
+        struct list_head *p;
         struct clk *c;
         int i = 0;
         int ret = 0;
 
-        if (link_registration)
-                p = oh->slave_ports.next;
+        p = oh->slave_ports.next;
 
         while (i < oh->slaves_cnt) {
-                os = _fetch_next_ocp_if(&p, oh->slaves, &i);
+                os = _fetch_next_ocp_if(&p, &i);
                 if (!os->clk)
                         continue;
 
@@ -704,7 +687,7 @@ static int _init_opt_clks(struct omap_hwmod *oh)
 static int _enable_clocks(struct omap_hwmod *oh)
 {
         struct omap_hwmod_ocp_if *os;
-        struct list_head *p = NULL;
+        struct list_head *p;
         int i = 0;
 
         pr_debug("omap_hwmod: %s: enabling clocks\n", oh->name);
@@ -712,11 +695,10 @@ static int _enable_clocks(struct omap_hwmod *oh)
         if (oh->_clk)
                 clk_enable(oh->_clk);
 
-        if (link_registration)
-                p = oh->slave_ports.next;
+        p = oh->slave_ports.next;
 
         while (i < oh->slaves_cnt) {
-                os = _fetch_next_ocp_if(&p, oh->slaves, &i);
+                os = _fetch_next_ocp_if(&p, &i);
 
                 if (os->_clk && (os->flags & OCPIF_SWSUP_IDLE))
                         clk_enable(os->_clk);
@@ -736,7 +718,7 @@ static int _enable_clocks(struct omap_hwmod *oh)
 static int _disable_clocks(struct omap_hwmod *oh)
 {
         struct omap_hwmod_ocp_if *os;
-        struct list_head *p = NULL;
+        struct list_head *p;
         int i = 0;
 
         pr_debug("omap_hwmod: %s: disabling clocks\n", oh->name);
@@ -744,11 +726,10 @@ static int _disable_clocks(struct omap_hwmod *oh)
         if (oh->_clk)
                 clk_disable(oh->_clk);
 
-        if (link_registration)
-                p = oh->slave_ports.next;
+        p = oh->slave_ports.next;
 
         while (i < oh->slaves_cnt) {
-                os = _fetch_next_ocp_if(&p, oh->slaves, &i);
+                os = _fetch_next_ocp_if(&p, &i);
 
                 if (os->_clk && (os->flags & OCPIF_SWSUP_IDLE))
                         clk_disable(os->_clk);
@@ -1026,12 +1007,11 @@ static int _get_addr_space_by_name(struct omap_hwmod *oh, const char *name,
         struct list_head *p = NULL;
         bool found = false;
 
-        if (link_registration)
-                p = oh->slave_ports.next;
+        p = oh->slave_ports.next;
 
         i = 0;
         while (i < oh->slaves_cnt) {
-                os = _fetch_next_ocp_if(NULL, oh->slaves, &i);
+                os = _fetch_next_ocp_if(&p, &i);
 
                 if (!os->addr)
                         return -ENOENT;
@@ -1071,7 +1051,7 @@ static int _get_addr_space_by_name(struct omap_hwmod *oh, const char *name,
 static void __init _save_mpu_port_index(struct omap_hwmod *oh)
 {
         struct omap_hwmod_ocp_if *os = NULL;
-        struct list_head *p = NULL;
+        struct list_head *p;
         int i = 0;
 
         if (!oh)
@@ -1079,14 +1059,12 @@ static void __init _save_mpu_port_index(struct omap_hwmod *oh)
 
         oh->_int_flags |= _HWMOD_NO_MPU_PORT;
 
-        if (link_registration)
-                p = oh->slave_ports.next;
+        p = oh->slave_ports.next;
 
         while (i < oh->slaves_cnt) {
-                os = _fetch_next_ocp_if(&p, oh->slaves, &i);
+                os = _fetch_next_ocp_if(&p, &i);
                 if (os->user & OCP_USER_MPU) {
                         oh->_mpu_port = os;
-                        oh->_mpu_port_index = i - 1;
                         oh->_int_flags &= ~_HWMOD_NO_MPU_PORT;
                         break;
                 }
@@ -1113,10 +1091,7 @@ static struct omap_hwmod_ocp_if *_find_mpu_rt_port(struct omap_hwmod *oh)
         if (!oh || oh->_int_flags & _HWMOD_NO_MPU_PORT || oh->slaves_cnt == 0)
                 return NULL;
 
-        if (!link_registration)
-                return oh->slaves[oh->_mpu_port_index];
-        else
-                return oh->_mpu_port;
+        return oh->_mpu_port;
 };
 
 /**
@@ -2104,16 +2079,15 @@ static int __init _init(struct omap_hwmod *oh, void *data)
 static void __init _setup_iclk_autoidle(struct omap_hwmod *oh)
 {
         struct omap_hwmod_ocp_if *os;
-        struct list_head *p = NULL;
+        struct list_head *p;
         int i = 0;
         if (oh->_state != _HWMOD_STATE_INITIALIZED)
                 return;
 
-        if (link_registration)
-                p = oh->slave_ports.next;
+        p = oh->slave_ports.next;
 
         while (i < oh->slaves_cnt) {
-                os = _fetch_next_ocp_if(&p, oh->slaves, &i);
+                os = _fetch_next_ocp_if(&p, &i);
                 if (!os->_clk)
                         continue;
 
@@ -2584,34 +2558,6 @@ int omap_hwmod_for_each(int (*fn)(struct omap_hwmod *oh, void *data),
 }
 
 /**
- * omap_hwmod_register - register an array of hwmods
- * @ohs: pointer to an array of omap_hwmods to register
- *
- * Intended to be called early in boot before the clock framework is
- * initialized.  If @ohs is not null, will register all omap_hwmods
- * listed in @ohs that are valid for this chip.  Returns 0.
- */
-int __init omap_hwmod_register(struct omap_hwmod **ohs)
-{
-        int r, i;
-
-        if (link_registration)
-                return -EINVAL;
-
-        if (!ohs)
-                return 0;
-
-        i = 0;
-        do {
-                r = _register(ohs[i]);
-                WARN(r, "omap_hwmod: %s: _register returned %d\n", ohs[i]->name,
-                     r);
-        } while (ohs[++i]);
-
-        return 0;
-}
-
-/**
  * omap_hwmod_register_links - register an array of hwmod links
  * @ois: pointer to an array of omap_hwmod_ocp_if to register
  *
@@ -2626,8 +2572,6 @@ int __init omap_hwmod_register_links(struct omap_hwmod_ocp_if **ois)
         if (!ois)
                 return 0;
 
-        link_registration = true;
-
         if (!linkspace) {
                 if (_alloc_linkspace(ois)) {
                         pr_err("omap_hwmod: could not allocate link space\n");
@@ -2888,17 +2832,16 @@ int omap_hwmod_reset(struct omap_hwmod *oh)
 int omap_hwmod_count_resources(struct omap_hwmod *oh)
 {
         struct omap_hwmod_ocp_if *os;
-        struct list_head *p = NULL;
+        struct list_head *p;
         int ret;
         int i = 0;
 
         ret = _count_mpu_irqs(oh) + _count_sdma_reqs(oh);
 
-        if (link_registration)
-                p = oh->slave_ports.next;
+        p = oh->slave_ports.next;
 
         while (i < oh->slaves_cnt) {
-                os = _fetch_next_ocp_if(&p, oh->slaves, &i);
+                os = _fetch_next_ocp_if(&p, &i);
                 ret += _count_ocp_if_addr_spaces(os);
         }
 
@@ -2918,7 +2861,7 @@ int omap_hwmod_count_resources(struct omap_hwmod *oh)
 int omap_hwmod_fill_resources(struct omap_hwmod *oh, struct resource *res)
 {
         struct omap_hwmod_ocp_if *os;
-        struct list_head *p = NULL;
+        struct list_head *p;
         int i, j, mpu_irqs_cnt, sdma_reqs_cnt, addr_cnt;
         int r = 0;
 
@@ -2942,12 +2885,11 @@ int omap_hwmod_fill_resources(struct omap_hwmod *oh, struct resource *res)
                 r++;
         }
 
-        if (link_registration)
-                p = oh->slave_ports.next;
+        p = oh->slave_ports.next;
 
         i = 0;
         while (i < oh->slaves_cnt) {
-                os = _fetch_next_ocp_if(&p, oh->slaves, &i);
+                os = _fetch_next_ocp_if(&p, &i);
                 addr_cnt = _count_ocp_if_addr_spaces(os);
 
                 for (j = 0; j < addr_cnt; j++) {
diff --git a/arch/arm/plat-omap/include/plat/omap_hwmod.h b/arch/arm/plat-omap/include/plat/omap_hwmod.h
index 09679032603c..14dde32cd406 100644
--- a/arch/arm/plat-omap/include/plat/omap_hwmod.h
+++ b/arch/arm/plat-omap/include/plat/omap_hwmod.h
@@ -504,12 +504,9 @@ struct omap_hwmod_link {
  * @_clk: pointer to the main struct clk (filled in at runtime)
  * @opt_clks: other device clocks that drivers can request (0..*)
  * @voltdm: pointer to voltage domain (filled in at runtime)
- * @masters: ptr to array of OCP ifs that this hwmod can initiate on
- * @slaves: ptr to array of OCP ifs that this hwmod can respond on
  * @dev_attr: arbitrary device attributes that can be passed to the driver
  * @_sysc_cache: internal-use hwmod flags
  * @_mpu_rt_va: cached register target start address (internal use)
- * @_mpu_port_index: cached MPU register target slave ID (internal use)
  * @_mpu_port: cached MPU register target slave (internal use)
  * @opt_clks_cnt: number of @opt_clks
  * @master_cnt: number of @master entries
@@ -549,8 +546,6 @@ struct omap_hwmod {
         struct omap_hwmod_opt_clk       *opt_clks;
         char                            *clkdm_name;
         struct clockdomain              *clkdm;
-        struct omap_hwmod_ocp_if        **masters; /* connect to *_IA */
-        struct omap_hwmod_ocp_if        **slaves;  /* connect to *_TA */
         struct list_head                master_ports; /* connect to *_IA */
         struct list_head                slave_ports; /* connect to *_TA */
         void                            *dev_attr;
@@ -560,7 +555,6 @@ struct omap_hwmod {
         struct list_head                node;
         struct omap_hwmod_ocp_if        *_mpu_port;
         u16                             flags;
-        u8                              _mpu_port_index;
         u8                              response_lat;
         u8                              rst_lines_cnt;
         u8                              opt_clks_cnt;
@@ -572,7 +566,6 @@ struct omap_hwmod {
         u8                              _postsetup_state;
 };
 
-int omap_hwmod_register(struct omap_hwmod **ohs);
 struct omap_hwmod *omap_hwmod_lookup(const char *name);
 int omap_hwmod_for_each(int (*fn)(struct omap_hwmod *oh, void *data),
                         void *data);