greybus: protocol: dedup protocol find code

in protocol register replace the protocol find code with the call to the already
existing function.

Signed-off-by: Rui Miguel Silva <rmfrfs@gmail.com>
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>

diff --git a/drivers/staging/greybus/protocol.c b/drivers/staging/greybus/protocol.c
index b8ae70799f81d2eb2317e61b0ea22bbac4a71162..12bbc2f2191f308ce754044f9ef3e9eb02e061d5 100644 (file)
--- a/drivers/staging/greybus/protocol.c
+++ b/drivers/staging/greybus/protocol.c
@@ -20,6 +20,13 @@ static struct gb_protocol *_gb_protocol_find(u8 id, u8 major, u8 minor)
 {
        struct gb_protocol *protocol;
 
+       /*
+        * The protocols list is sorted first by protocol id (low to
+        * high), then by major version (high to low), and finally
+        * by minor version (high to low).  Searching only by
+        * protocol id will produce the newest implemented version
+        * of the protocol.
+        */
        list_for_each_entry(protocol, &gb_protocols, links) {
                if (protocol->id < id)
                        continue;
@@ -50,34 +57,12 @@ int __gb_protocol_register(struct gb_protocol *protocol, struct module *module)
 
        protocol->owner = module;
 
-       /*
-        * The protocols list is sorted first by protocol id (low to
-        * high), then by major version (high to low), and finally
-        * by minor version (high to low).  Searching only by
-        * protocol id will produce the newest implemented version
-        * of the protocol.
-        */
        spin_lock_irq(&gb_protocols_lock);
 
-       list_for_each_entry(existing, &gb_protocols, links) {
-               if (existing->id < id)
-                       continue;
-               if (existing->id > id)
-                       break;
-
-               if (existing->major > major)
-                       continue;
-               if (existing->major < major)
-                       break;
-
-               if (existing->minor > minor)
-                       continue;
-               if (existing->minor < minor)
-                       break;
-
-               /* A matching protocol has already been registered */
+       /* check if the protocol already wos registered */
+       existing = _gb_protocol_find(id, major, minor);
+       if (existing) {
                spin_unlock_irq(&gb_protocols_lock);
-
                return -EEXIST;
        }