summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorJean Delvare <jdelvare@suse.de>2015-06-25 09:06:57 +0200
committerJean Delvare <jdelvare@suse.de>2015-06-25 09:06:57 +0200
commitd1d8704c48f9c2bb791e8e183a41019f35a3f7f0 (patch)
treeff321984a14569e1560841ade02e307d4d244982 /drivers
parentDocumentation: ABI: sysfs-firmware-dmi: add -entries suffix to file name (diff)
downloadlinux-d1d8704c48f9c2bb791e8e183a41019f35a3f7f0.tar.xz
linux-d1d8704c48f9c2bb791e8e183a41019f35a3f7f0.zip
firmware: dmi_scan: Coding style cleanups
Signed-off-by: Jean Delvare <jdelvare@suse.de>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/firmware/dmi_scan.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/firmware/dmi_scan.c b/drivers/firmware/dmi_scan.c
index 5e0b770fdae5..ac1ce4a73edf 100644
--- a/drivers/firmware/dmi_scan.c
+++ b/drivers/firmware/dmi_scan.c
@@ -501,12 +501,12 @@ static int __init dmi_present(const u8 *buf)
switch (smbios_ver) {
case 0x021F:
case 0x0221:
- pr_debug("SMBIOS version fixup(2.%d->2.%d)\n",
+ pr_debug("SMBIOS version fixup (2.%d->2.%d)\n",
smbios_ver & 0xFF, 3);
smbios_ver = 0x0203;
break;
case 0x0233:
- pr_debug("SMBIOS version fixup(2.%d->2.%d)\n", 51, 6);
+ pr_debug("SMBIOS version fixup (2.%d->2.%d)\n", 51, 6);
smbios_ver = 0x0206;
break;
}
@@ -554,8 +554,7 @@ static int __init dmi_smbios3_present(const u8 *buf)
{
if (memcmp(buf, "_SM3_", 5) == 0 &&
buf[6] < 32 && dmi_checksum(buf, buf[6])) {
- dmi_ver = get_unaligned_be32(buf + 6);
- dmi_ver &= 0xFFFFFF;
+ dmi_ver = get_unaligned_be32(buf + 6) & 0xFFFFFF;
dmi_num = 0; /* No longer specified */
dmi_len = get_unaligned_le32(buf + 12);
dmi_base = get_unaligned_le64(buf + 16);