[media] media: rc: Use bsearch library function

Replace self coded binary search, by existing library version.

Signed-off-by: Thomas Meyer <thomas@m3y3r.de>
Signed-off-by: Sean Young <sean@mess.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>

diff --git a/drivers/media/rc/rc-main.c b/drivers/media/rc/rc-main.c
index 8c828fe..e0901a2 100644 (file)
--- a/drivers/media/rc/rc-main.c
+++ b/drivers/media/rc/rc-main.c
@@ -15,6 +15,7 @@
 #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
 
 #include <media/rc-core.h>
+#include <linux/bsearch.h>
 #include <linux/spinlock.h>
 #include <linux/delay.h>
 #include <linux/input.h>
@@ -460,6 +461,18 @@ static int ir_setkeytable(struct rc_dev *dev,
        return rc;
 }
 
+static int rc_map_cmp(const void *key, const void *elt)
+{
+       const unsigned int *scancode = key;
+       const struct rc_map_table *e = elt;
+
+       if (*scancode < e->scancode)
+               return -1;
+       else if (*scancode > e->scancode)
+               return 1;
+       return 0;
+}
+
 /**
  * ir_lookup_by_scancode() - locate mapping by scancode
  * @rc_map:    the struct rc_map to search
@@ -472,21 +485,14 @@ static int ir_setkeytable(struct rc_dev *dev,
 static unsigned int ir_lookup_by_scancode(const struct rc_map *rc_map,
                                          unsigned int scancode)
 {
-       int start = 0;
-       int end = rc_map->len - 1;
-       int mid;
-
-       while (start <= end) {
-               mid = (start + end) / 2;
-               if (rc_map->scan[mid].scancode < scancode)
-                       start = mid + 1;
-               else if (rc_map->scan[mid].scancode > scancode)
-                       end = mid - 1;
-               else
-                       return mid;
-       }
+       struct rc_map_table *res;
 
-       return -1U;
+       res = bsearch(&scancode, rc_map->scan, rc_map->len,
+                     sizeof(struct rc_map_table), rc_map_cmp);
+       if (!res)
+               return -1U;
+       else
+               return res - rc_map->scan;
 }
 
 /**