[PATCH] firmware: dmi_scan: Clarify dmi_save_extended_devices

From	Jean Delvare <jdelvare@suse.de>
Newsgroups	linux.kernel
Subject	[PATCH] firmware: dmi_scan: Clarify dmi_save_extended_devices
Date	2015-11-27 13:50 +0100
Message-ID	<qzqDn-2Ve-5@gated-at.bofh.it> (permalink)
References	<qz0zf-2JX-3@gated-at.bofh.it>
Organization	SUSE Linux

Show all headers | View raw

Get rid of the arbitrary 5-byte pointer offset, it served no purpose
and made it harder to match the code with the SMBIOS specification.

Signed-off-by: Jean Delvare <jdelvare@suse.de>
Cc: Jordan Hargrave <jordan_hargrave@dell.com>
Cc: Narendra K <narendra_k@dell.com>
---
Note: goes on top of the patch "Optimize dmi_save_extended_devices" I
sent yesterday. Also both patches collide with Jordan's current work,
but I will take care of merging everything, don't worry.

 drivers/firmware/dmi_scan.c |   11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

--- linux-4.3.orig/drivers/firmware/dmi_scan.c	2015-11-27 13:30:59.855014180 +0100
+++ linux-4.3/drivers/firmware/dmi_scan.c	2015-11-27 13:36:03.264773918 +0100
@@ -346,16 +346,15 @@ static void __init dmi_save_dev_onboard(
 static void __init dmi_save_extended_devices(const struct dmi_header *dm)
 {
 	const char *name;
-	const u8 *d = (u8 *) dm + 5;
+	const u8 *d = (u8 *)dm;
 
 	/* Skip disabled device */
-	if ((*d & 0x80) == 0)
+	if ((d[0x5] & 0x80) == 0)
 		return;
 
-	name = dmi_string_nosave(dm, *(d - 1));
-	dmi_save_dev_onboard(*(d+1), *(u16 *)(d+2), *(d+4), *(d+5),
-			     name);
-	dmi_save_one_device(*d & 0x7f, name);
+	name = dmi_string_nosave(dm, d[0x4]);
+	dmi_save_dev_onboard(d[0x6], *(u16 *)(d + 0x7), d[0x9], d[0xA], name);
+	dmi_save_one_device(d[0x5] & 0x7f, name);
 }
 
 static void __init count_mem_devices(const struct dmi_header *dm, void *v)

-- 
Jean Delvare
SUSE L3 Support
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Back to linux.kernel | Previous | Next — Previous in thread | Find similar | Unroll thread

Thread

[PATCH] firmware: dmi_scan: Optimize dmi_save_extended_devices Jean Delvare <jdelvare@suse.de> - 2015-11-26 10:00 +0100
  [PATCH] firmware: dmi_scan: Clarify dmi_save_extended_devices Jean Delvare <jdelvare@suse.de> - 2015-11-27 13:50 +0100

csiph-web