From 1b580c7785945f9e502a71d631c37fbcc5fdb9ed Mon Sep 17 00:00:00 2001 From: Igor Pecovnik Date: Wed, 22 Jun 2016 06:55:47 +0200 Subject: [PATCH] Lemaker Guitar further patch cleanup --- .../s500-default/2-patch-3.10.101-102.patch | 60 ------------------- 1 file changed, 60 deletions(-) diff --git a/patch/kernel/s500-default/2-patch-3.10.101-102.patch b/patch/kernel/s500-default/2-patch-3.10.101-102.patch index af1472cd20..c2816c0320 100644 --- a/patch/kernel/s500-default/2-patch-3.10.101-102.patch +++ b/patch/kernel/s500-default/2-patch-3.10.101-102.patch @@ -852,66 +852,6 @@ index 3bdefbfb4377..0d40f7f0c379 100644 pvt = mci->pvt_info; /* -diff --git a/drivers/firmware/efi/vars.c b/drivers/firmware/efi/vars.c -index 9f82b5545edd..61e7ec5a742c 100644 ---- a/drivers/firmware/efi/vars.c -+++ b/drivers/firmware/efi/vars.c -@@ -202,29 +202,44 @@ static const struct variable_validate variable_validate[] = { - { NULL_GUID, "", NULL }, - }; - -+/* -+ * Check if @var_name matches the pattern given in @match_name. -+ * -+ * @var_name: an array of @len non-NUL characters. -+ * @match_name: a NUL-terminated pattern string, optionally ending in "*". A -+ * final "*" character matches any trailing characters @var_name, -+ * including the case when there are none left in @var_name. -+ * @match: on output, the number of non-wildcard characters in @match_name -+ * that @var_name matches, regardless of the return value. -+ * @return: whether @var_name fully matches @match_name. -+ */ - static bool - variable_matches(const char *var_name, size_t len, const char *match_name, - int *match) - { - for (*match = 0; ; (*match)++) { - char c = match_name[*match]; -- char u = var_name[*match]; - -- /* Wildcard in the matching name means we've matched */ -- if (c == '*') -+ switch (c) { -+ case '*': -+ /* Wildcard in @match_name means we've matched. */ - return true; - -- /* Case sensitive match */ -- if (!c && *match == len) -- return true; -+ case '\0': -+ /* @match_name has ended. Has @var_name too? */ -+ return (*match == len); - -- if (c != u) -+ default: -+ /* -+ * We've reached a non-wildcard char in @match_name. -+ * Continue only if there's an identical character in -+ * @var_name. -+ */ -+ if (*match < len && c == var_name[*match]) -+ continue; - return false; -- -- if (!c) -- return true; -+ } - } -- return true; - } - - bool diff --git a/drivers/gpu/drm/radeon/atombios_encoders.c b/drivers/gpu/drm/radeon/atombios_encoders.c index 1b564d7e4191..5b8d868d8691 100644 --- a/drivers/gpu/drm/radeon/atombios_encoders.c