From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756994AbdIHTqa (ORCPT ); Fri, 8 Sep 2017 15:46:30 -0400 Received: from www17.your-server.de ([213.133.104.17]:40520 "EHLO www17.your-server.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756962AbdIHTq1 (ORCPT ); Fri, 8 Sep 2017 15:46:27 -0400 From: Thomas Meyer To: linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, mchehab@kernel.org Cc: Thomas Meyer Subject: [PATCH] media: rc: Use bsearch library function Date: Fri, 8 Sep 2017 18:33:36 +0200 Message-Id: <20170908163336.2438-1-thomas@m3y3r.de> X-Mailer: git-send-email 2.11.0 X-Authenticated-Sender: thomas@m3y3r.de Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Replace self coded binary search, by existing library version. Signed-off-by: Thomas Meyer --- drivers/media/rc/rc-main.c | 34 ++++++++++++++++++++-------------- 1 file changed, 20 insertions(+), 14 deletions(-) diff --git a/drivers/media/rc/rc-main.c b/drivers/media/rc/rc-main.c index 981cccd6b988..d3d6537867fb 100644 --- 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 +#include #include #include #include @@ -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) +{ + unsigned int scancode = *(unsigned int *) key; + struct rc_map_table *e = (struct rc_map_table *) elt; + + if (e->scancode > scancode) + return -1; + else if (e->scancode < 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 == NULL) + return -1U; + else + return res - rc_map->scan; } /** -- 2.11.0