From 997916843fe668f6f1fc2c3e7d30e00f581de4e4 Mon Sep 17 00:00:00 2001 From: Ryan Lattrel Date: Tue, 17 Jul 2018 09:42:44 -0500 Subject: [PATCH] modules: mmi_info: fix machine name Update the machine name property in the unit info sub module - remove the machine name from 32 bit implementations. Change-Id: Iaf31d8d9c3861fd652fb2226cc89a239da626968 Signed-off-by: Ryan Lattrel Reviewed-on: https://gerrit.mot.com/1210671 SLTApproved: Slta Waiver SME-Granted: SME Approvals Granted Reviewed-by: Yue Sun Tested-by: Jira Key Reviewed-by: Xiangpo Zhao Submit-Approved: Jira Key --- drivers/mmi_info/mmi_unit_info.c | 8 -------- 1 file changed, 8 deletions(-) diff --git a/drivers/mmi_info/mmi_unit_info.c b/drivers/mmi_info/mmi_unit_info.c index fd3e9070df90..f466a101a1db 100644 --- a/drivers/mmi_info/mmi_unit_info.c +++ b/drivers/mmi_info/mmi_unit_info.c @@ -21,10 +21,6 @@ #include #include "mmi_info.h" -#ifndef CONFIG_ARM64 -#include -#endif - #if LINUX_VERSION_CODE >= KERNEL_VERSION(4,14,0) #include /* Match to @@ -110,11 +106,7 @@ static int mmi_unit_smem_setup(void) mui_copy->system_rev = mmi_chosen_data.system_rev; mui_copy->system_serial_low = mmi_chosen_data.system_serial_low; mui_copy->system_serial_high = mmi_chosen_data.system_serial_high; -#ifndef CONFIG_ARM64 - strlcpy(mui_copy->machine, machine_desc->name, MACHINE_MAX_LEN); -#else strlcpy(mui_copy->machine, "", MACHINE_MAX_LEN); -#endif strlcpy(mui_copy->barcode, serialno, BARCODE_MAX_LEN); strlcpy(mui_copy->baseband, mmi_chosen_data.baseband, BASEBAND_MAX_LEN); strlcpy(mui_copy->carrier, carrier, CARRIER_MAX_LEN);