Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 392bd8b5 authored by Andy Shevchenko's avatar Andy Shevchenko Committed by Matthew Garrett
Browse files

platform: x86: throw away custom methods 



In 2.6.35 the hex_to_bin() was introduced.

Signed-off-by: default avatarAndy Shevchenko <andy.shevchenko@gmail.com>
Cc: Carlos Corbacho <carlos@strangeworlds.co.uk>
Cc: Matthew Garrett <mjg@redhat.com>
Cc: platform-driver-x86@vger.kernel.org
Signed-off-by: default avatarMatthew Garrett <mjg@redhat.com>
parent 91e5d284

drivers/platform/x86/wmi.c

+6 −18
Original line number Diff line number Diff line
@@ -128,30 +128,18 @@ static struct acpi_driver acpi_wmi_driver = { 
 */

static int wmi_parse_hexbyte(const u8 *src)

{

	unsigned int x; /* For correct wrapping */

	int h;

	int value;



	/* high part */

	x = src[0];

	if (x - '0' <= '9' - '0') {

		h = x - '0';

	} else if (x - 'a' <= 'f' - 'a') {

		h = x - 'a' + 10;

	} else if (x - 'A' <= 'F' - 'A') {

		h = x - 'A' + 10;

	} else {

	h = value = hex_to_bin(src[0]);

	if (value < 0)

		return -1;

	}

	h <<= 4;



	/* low part */

	x = src[1];

	if (x - '0' <= '9' - '0')

		return h | (x - '0');

	if (x - 'a' <= 'f' - 'a')

		return h | (x - 'a' + 10);

	if (x - 'A' <= 'F' - 'A')

		return h | (x - 'A' + 10);

	value = hex_to_bin(src[1]);

	if (value >= 0)

		return (h << 4) | value;

	return -1;

}