From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752972AbbKZIv3 (ORCPT ); Thu, 26 Nov 2015 03:51:29 -0500 Received: from mx2.suse.de ([195.135.220.15]:45878 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752060AbbKZIv1 (ORCPT ); Thu, 26 Nov 2015 03:51:27 -0500 Date: Thu, 26 Nov 2015 09:51:24 +0100 From: Jean Delvare To: LKML Cc: Jordan Hargrave , Narendra K Subject: [PATCH] firmware: dmi_scan: Optimize dmi_save_extended_devices Message-ID: <20151126095124.1ea4226a@endymion.delvare> Organization: SUSE Linux X-Mailer: Claws Mail 3.10.1 (GTK+ 2.24.23; x86_64-suse-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Calling dmi_string_nosave isn't cheap, so avoid calling it twice in a row for the same string. Signed-off-by: Jean Delvare Cc: Jordan Hargrave Cc: Narendra K --- drivers/firmware/dmi_scan.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) --- linux-4.3.orig/drivers/firmware/dmi_scan.c 2015-11-25 20:32:26.565009189 +0100 +++ linux-4.3/drivers/firmware/dmi_scan.c 2015-11-26 09:44:34.242605581 +0100 @@ -345,15 +345,17 @@ 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; /* Skip disabled device */ if ((*d & 0x80) == 0) return; + name = dmi_string_nosave(dm, *(d - 1)); dmi_save_dev_onboard(*(d+1), *(u16 *)(d+2), *(d+4), *(d+5), - dmi_string_nosave(dm, *(d-1))); - dmi_save_one_device(*d & 0x7f, dmi_string_nosave(dm, *(d - 1))); + name); + dmi_save_one_device(*d & 0x7f, name); } static void __init count_mem_devices(const struct dmi_header *dm, void *v) -- Jean Delvare SUSE L3 Support