Staging: ti-st: fix protocol counting

Older mechanism of counting the number of protocols
registered with ST was slow, in-efficient.
It used to check the protocol data for NULL for each
registration/unregistration.

With this change, counting protocols in maintained by
a single counter protos_registered.

Counting protocols is not just for debug purposes

Signed-off-by: Naveen Jain <naveen_jain@ti.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/staging/ti-st/st_core.c b/drivers/staging/ti-st/st_core.c
index 4e93694e1c2137bc7df74a4336e0aa54080af8e6..a492369033750ecc6eabd46bb7ebeeb468a47a89 100644 (file)
--- a/drivers/staging/ti-st/st_core.c
+++ b/drivers/staging/ti-st/st_core.c
@@ -584,10 +584,11 @@ void kim_st_list_protocols(struct st_data_s *st_gdata, char *buf)
        }
        sprintf(buf, "%s\n", buf);
 #else /* limited info */
-       sprintf(buf, "BT=%c\nFM=%c\nGPS=%c\n",
-               st_gdata->list[ST_BT] != NULL ? 'R' : 'U',
-               st_gdata->list[ST_FM] != NULL ? 'R' : 'U',
-               st_gdata->list[ST_GPS] != NULL ? 'R' : 'U');
+       sprintf(buf, "[%d]\nBT=%c\nFM=%c\nGPS=%c\n",
+                       st_gdata->protos_registered,
+                       st_gdata->list[ST_BT] != NULL ? 'R' : 'U',
+                       st_gdata->list[ST_FM] != NULL ? 'R' : 'U',
+                       st_gdata->list[ST_GPS] != NULL ? 'R' : 'U');
 #endif
        spin_unlock_irqrestore(&st_gdata->lock, flags);
 }
@@ -630,6 +631,7 @@ long st_register(struct st_proto_s *new_proto)
                st_kim_chip_toggle(new_proto->type, KIM_GPIO_ACTIVE);
 
                st_gdata->list[new_proto->type] = new_proto;
+               st_gdata->protos_registered++;
                new_proto->write = st_write;
 
                set_bit(ST_REG_PENDING, &st_gdata->st_state);
@@ -673,7 +675,6 @@ long st_register(struct st_proto_s *new_proto)
                if ((st_gdata->protos_registered != ST_EMPTY) &&
                    (test_bit(ST_REG_PENDING, &st_gdata->st_state))) {
                        pr_info(" call reg complete callback ");
-                       st_gdata->protos_registered++;
                        st_reg_complete(st_gdata, ST_SUCCESS);
                }
                clear_bit(ST_REG_PENDING, &st_gdata->st_state);
@@ -689,6 +690,7 @@ long st_register(struct st_proto_s *new_proto)
 
                spin_lock_irqsave(&st_gdata->lock, flags);
                st_gdata->list[new_proto->type] = new_proto;
+               st_gdata->protos_registered++;
                new_proto->write = st_write;
                spin_unlock_irqrestore(&st_gdata->lock, flags);
                return err;
@@ -712,6 +714,7 @@ long st_register(struct st_proto_s *new_proto)
                        break;
                }
                st_gdata->list[new_proto->type] = new_proto;
+               st_gdata->protos_registered++;
                new_proto->write = st_write;
 
                /* lock already held before entering else */