Commit 580c47d8 authored by Rui Miguel Silva's avatar Rui Miguel Silva Committed by Greg Kroah-Hartman

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: default avatarRui Miguel Silva <rmfrfs@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <greg@kroah.com>
parent 0008d9d0
...@@ -20,6 +20,13 @@ static struct gb_protocol *_gb_protocol_find(u8 id, u8 major, u8 minor) ...@@ -20,6 +20,13 @@ static struct gb_protocol *_gb_protocol_find(u8 id, u8 major, u8 minor)
{ {
struct gb_protocol *protocol; 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) { list_for_each_entry(protocol, &gb_protocols, links) {
if (protocol->id < id) if (protocol->id < id)
continue; continue;
...@@ -50,34 +57,12 @@ int __gb_protocol_register(struct gb_protocol *protocol, struct module *module) ...@@ -50,34 +57,12 @@ int __gb_protocol_register(struct gb_protocol *protocol, struct module *module)
protocol->owner = 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); spin_lock_irq(&gb_protocols_lock);
list_for_each_entry(existing, &gb_protocols, links) { /* check if the protocol already wos registered */
if (existing->id < id) existing = _gb_protocol_find(id, major, minor);
continue; if (existing) {
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 */
spin_unlock_irq(&gb_protocols_lock); spin_unlock_irq(&gb_protocols_lock);
return -EEXIST; return -EEXIST;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment