From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752822AbbIPVFT (ORCPT ); Wed, 16 Sep 2015 17:05:19 -0400 Received: from mail-by2on0058.outbound.protection.outlook.com ([207.46.100.58]:48480 "EHLO na01-by2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751965AbbIPVFQ (ORCPT ); Wed, 16 Sep 2015 17:05:16 -0400 X-Greylist: delayed 1121 seconds by postgrey-1.27 at vger.kernel.org; Wed, 16 Sep 2015 17:05:15 EDT Authentication-Results: spf=none (sender IP is 165.204.84.222) smtp.mailfrom=amd.com; alien8.de; dkim=none (message not signed) header.d=none;alien8.de; dmarc=permerror action=none header.from=amd.com; X-WSS-ID: 0NUSEAY-08-CM5-02 X-M-MSG: From: Aravind Gopalakrishnan To: , , CC: , Subject: [PATCH 1/3] EDAC, ghes_edac: Remove redundant memory_type array Date: Wed, 16 Sep 2015 15:53:29 -0500 Message-ID: <1442436811-23382-2-git-send-email-Aravind.Gopalakrishnan@amd.com> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1442436811-23382-1-git-send-email-Aravind.Gopalakrishnan@amd.com> References: <1442436811-23382-1-git-send-email-Aravind.Gopalakrishnan@amd.com> MIME-Version: 1.0 Content-Type: text/plain X-EOPAttributedMessage: 0 X-Forefront-Antispam-Report: CIP:165.204.84.222;CTRY:US;IPV:NLI;EFV:NLI;SFV:NSPM;SFS:(10009020)(6009001)(2980300002)(428002)(189002)(199003)(68736005)(97736004)(50986999)(189998001)(2950100001)(19580395003)(19580405001)(47776003)(5003940100001)(50226001)(77096005)(36756003)(53416004)(86362001)(5003600100002)(5007970100001)(62966003)(5001830100001)(87936001)(106466001)(64706001)(229853001)(4001540100001)(77156002)(46102003)(5001860100001)(48376002)(92566002)(105586002)(5001770100001)(50466002)(2201001)(11100500001)(76176999)(101416001);DIR:OUT;SFP:1101;SCL:1;SRVR:BLUPR12MB0707;H:atltwp02.amd.com;FPR:;SPF:None;PTR:InfoDomainNonexistent;MX:1;A:1;LANG:en; X-Microsoft-Exchange-Diagnostics: 1;BLUPR12MB0707;2:ysv/WVeA4rtsbdtr3qPaJBllhsoIW0lGBDEbpxy4l0zqKYie5YjTyJxVUzxvKFmH1PiSXep073kYVi3mwAKU1VPfWuZKxjVLq5RxYkxicRTnOzq3zLUvddzdlJyuGVLHZearvAfFq/E6m+8yBAGYzIctH0GgI6RZAPuA/88Rq5Q=;3:cCr53e/guz+1Pz9XbPPEAQ75kG6nWjnMHXDpFcmZxr3XpDz4CCRA9s/W7w5B6NelCTujGF7JK12Y7yx7vnI8mgoeGDjy0fBoeTWqkP/RpyaqsDssN41GIOKucYh/v6qDhVnuQRk/nSJx4KbimyC4yMkdAwdknquRVRN5u8Z5PQ7vICNo+pShVHOvx1xlICJPI7zbC900Xe8f563UvmJ6ykJYx6RLqPit9gmI16pLkVrKR7T0yLq4xCGEMTvz2gcs;25:MZba9PudcTE8M8Zc27ib0tetzC0VTZ1LFQ0OC1FD9OI19Ma4FvIRHQuW4fX8K8RW8zZCREEvRQ/0eCRyXG823g0FK3t+qoA9me42ROIySA0W4HzPM7waO0BwmfhMp/aSu6YxRvYfSAC0289rID3KRglcKjXs7qwFoH90mmti613jt+tkf7CjGkFSooKOxVuZhz4+dgMFfpHreSHS6ZoKDDNohK0ojye6LoBN0P5IysDI5TdmvzV0S8ibN1b6MR5QAPMlkd4pmyL+Vi3yv3r8bQ== X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:BLUPR12MB0707; X-Microsoft-Exchange-Diagnostics: 1;BLUPR12MB0707;20:1uK8LOrSUYeKcAnlP9TbZlBP1hYrcQQNw7mma0U+pew6xyT+uGi7A1veHwTkJiuQa2OqVCtFveI8qAYph9Pb4wKz/tHbP0Zsuk060NEjAXyMQRBY6oAyFw5Qm5IZ8IGDouINFVweGytS8tguoXdKcJL3B4CjF8KVeY39Hhu+Im62gIgrFQ/ctzJSqkW68p0CkzVhw3BAy02bCu+QWoeTc+pDSMMlEmC8dF2/mZGpq9fZCsJMYfelb7k2sYAfNo3kan+a6PUR7qT4SabX6nB6QSjyX9Qhv5OfK24jEWkYBYxvRvf0QLhO9ZfH56AAaMsdY6JUUhglEWMY/vhKDQ/HIJT2IjnRsyqxqTfUwDVunbTz5DRk3lxThIf8/Qd+e6sQNy6+Q2EE9uhQMdJ+hC1uGM8AFMWgLje04qUAOIZ1r9kW8+VMqgng5UnPJ7sV3e99SEorVk6BewxndrIsCLeVLKNQ2hEz9vQyxDhxzqy+tNXxkPRqNb47YI58wkLQ/YUu;4:M34PCp+k/e9UmvPGR46cGkxMIvOJ9jjxodjBTaSah1tSwlhzh7xDpfChMsXuk7GLJZ1HODXHlCcRvWr1lgNwXORo97tJ0nsFf4r+JxYHT3/XxogxtOnKjbvtvy1uPLPKQa1bXAv3yT4hu+UOr3bTqYswkZ7zE4LOtnzhZB84F+R4nIUOtGUtuX3P/385PtU6eB5sGQ876sPWwvSKh3UYOc4/eoQrVxVT7kYIbxUaCjROd3IZZE4Q5yC1wIoe1oHoulk/uhVQ+vybi8S9Rk81q6eBf6WvvTPl0Hvz1WmlLNHBsTiYDqp59MscGvnWVYb7jjPrPlkZklN0VWvlvS0qfJaohsqXzzDAjCSUVqErcMQ= X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(601004)(5005006)(8121501046)(520078)(520075)(3002001);SRVR:BLUPR12MB0707;BCL:0;PCL:0;RULEID:;SRVR:BLUPR12MB0707; X-Forefront-PRVS: 07013D7479 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1;BLUPR12MB0707;23:t0IOX09G04cjuYEYX9+VNa81cEtYG68yEElHFWxlO?= =?us-ascii?Q?jAV81nw+AdX671L8wN9+lXtVbrukdVtQ+5YqB4U6eOBSCvTliTVOdzRvWMDb?= =?us-ascii?Q?vQzkaQAHfznzfQite3xl9YbeOg2ws9Czdy6qnaecq3aywgXmVv8s8lIHjItU?= =?us-ascii?Q?WBUIh20ZlaOmoXi4aFgckKaRhZsTQ9zhZN7gF1I07XDNJkNceFVtegt28uZb?= =?us-ascii?Q?UlltquHCa7R8v15JD52hT1AnOSS2slesEibnwIBBF5VODpONVaMKeIs0Szvf?= =?us-ascii?Q?PwRhMdGzyOZSrTkbp6oFFFfbhMeGxKeDTB2vuESqdPu4sQQRSkuS4WFoI7tt?= =?us-ascii?Q?8G7P2rjFiOBXECqVxCIbhmOG0lH73d0wb6e0Qe4SHoa8jZBnkmG9RszfqqZo?= =?us-ascii?Q?0FZzFUNMC1cmMf8MuwyVtGubzCjxWJ+oh85C7naik+1eJrva+ZqB+u0U/6X6?= =?us-ascii?Q?D5Sp7bHx/yJWLyIRYjFzbKVn5texUQWKdHPifmJFyN5B5siWmXoNZv1PRrKr?= =?us-ascii?Q?6yOx+N3XxZe44NH7HmHdZIN2ggAzdduDg9Y/zJS3sLjJxGwsHGZX+QWzVdtF?= =?us-ascii?Q?PoVpvAMyrpXZwneW4BPUEoivXFmXxggyIhy/xz75+t5nBUQQAedPL7SZalsU?= =?us-ascii?Q?aLuQ7yeKQf/jjUv13rZ3PAhQSrNQ0SFHxtl9WeUU4TjU182wW3BBb5Eho9R5?= =?us-ascii?Q?GM7JFEk4Xz+VN1HaGo3uAFB+DoXYwn88ROdMjlbJwsFGd8nwPQllS4XA0FFq?= =?us-ascii?Q?ps9XMzi3ZERTFWgVlL8G4x/mbCGgrUxU4ks7bF0Oc4eaiQV8PaDF2w6zCBdf?= =?us-ascii?Q?OEbKyfide2kkN9AroIOogg2cqCoj401fM3bQDQm01QEWJ9jMRhcBnMfcPDTp?= =?us-ascii?Q?vPAlPZBwGpZnONAIupdDEyqkWBQR2uxbnhMKFYRnUIl44G2NVE5PjWWRp2C3?= =?us-ascii?Q?M4JWwyR95xAnC7hgDDSakT/CoOGXPsItgPjOtKbAXT+6CYfQ1t8N2LrTb0Hd?= =?us-ascii?Q?v9ZK2ESpdDu7U7Gf+Pf7B8b77Rjowjjsvi+W0DRPO1ON1RRAWHwgn742VDHj?= =?us-ascii?Q?hu7ss8YaLAHW/Clb8ferVhLlSjULiXyZmY7VXvbD8s85ROV20L9NVwRvS77p?= =?us-ascii?Q?q715YFWKzA=3D?= X-Microsoft-Exchange-Diagnostics: 1;BLUPR12MB0707;5:enllTg9Q2YnSybt9aBZgWgES5niSGlQYo9Mh11G2OZAXFiCPb14oMq/gHXfkn3EZfvOGLervzjJ1z1/eK+ZsXiZ4iE8PbVmrwjzBSuiKhznKh/ESwUzep09kKEx6BEBgIe9IM+p7iWYNfWO53SAnWw==;24:ZGWZQqogZWx7SBe09NjfaRmFvviFiYHAYNyszNQvsbYiC1+VYnF152i9gNAk23DCr/96bn9STIi9paOwq3cOoXtR24iSUN85TeBuux5eE+4=;20:LjeJSBtXsTUwQJHj2u8HIljHod5IVHmu8QuL9q4qWBP1V5tawsTcbQx/UbeT15s/NM4iaAa9Jbj5oRTymWRTjQ== SpamDiagnosticOutput: 1:23 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Sep 2015 20:30:37.5283 (UTC) X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d;Ip=[165.204.84.222];Helo=[atltwp02.amd.com] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BLUPR12MB0707 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org We already have edac_mem_types[] that enumerates the different kinds of memory. So, use that and remove the redundant memory_type[] array here. Signed-off-by: Aravind Gopalakrishnan --- drivers/edac/ghes_edac.c | 22 +--------------------- 1 file changed, 1 insertion(+), 21 deletions(-) diff --git a/drivers/edac/ghes_edac.c b/drivers/edac/ghes_edac.c index b246819..b1e4512 100644 --- a/drivers/edac/ghes_edac.c +++ b/drivers/edac/ghes_edac.c @@ -66,26 +66,6 @@ struct ghes_edac_dimm_fill { unsigned count; }; -char *memory_type[] = { - [MEM_EMPTY] = "EMPTY", - [MEM_RESERVED] = "RESERVED", - [MEM_UNKNOWN] = "UNKNOWN", - [MEM_FPM] = "FPM", - [MEM_EDO] = "EDO", - [MEM_BEDO] = "BEDO", - [MEM_SDR] = "SDR", - [MEM_RDR] = "RDR", - [MEM_DDR] = "DDR", - [MEM_RDDR] = "RDDR", - [MEM_RMBS] = "RMBS", - [MEM_DDR2] = "DDR2", - [MEM_FB_DDR2] = "FB_DDR2", - [MEM_RDDR2] = "RDDR2", - [MEM_XDR] = "XDR", - [MEM_DDR3] = "DDR3", - [MEM_RDDR3] = "RDDR3", -}; - static void ghes_edac_count_dimms(const struct dmi_header *dh, void *arg) { int *num_dimm = arg; @@ -173,7 +153,7 @@ static void ghes_edac_dmidecode(const struct dmi_header *dh, void *arg) if (dimm->nr_pages) { edac_dbg(1, "DIMM%i: %s size = %d MB%s\n", - dimm_fill->count, memory_type[dimm->mtype], + dimm_fill->count, edac_mem_types[dimm->mtype], PAGES_TO_MiB(dimm->nr_pages), (dimm->edac_mode != EDAC_NONE) ? "(ECC)" : ""); edac_dbg(2, "\ttype %d, detail 0x%02x, width %d(total %d)\n", -- 2.5.0