From patchwork Mon Jun 24 15:09:13 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Robert Richter X-Patchwork-Id: 167607 Delivered-To: patch@linaro.org Received: by 2002:a92:4782:0:0:0:0:0 with SMTP id e2csp4347496ilk; Mon, 24 Jun 2019 08:09:27 -0700 (PDT) X-Google-Smtp-Source: APXvYqweXBCjDrQnrPEJSZsRZnd5dMllAL5+D/RW3Pmsc9hUpbTzkyJMjyRhs2WoBEX4hnaYPUjx X-Received: by 2002:a17:902:8609:: with SMTP id f9mr137797234plo.252.1561388967454; Mon, 24 Jun 2019 08:09:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1561388967; cv=none; d=google.com; s=arc-20160816; b=wOEBgtnRwbBick+vBwrV48c55zVZj4XryEjTb06YAzmbjc6utSFpeWje7rok0vy7gp 09IImghHjBPliBJG5mLQThEF/jzKEJu//EzkbY/SBQSuxNeUP5Qs3Mb7m9dDr7oKhzaP 4pmuKIjygbmGUAZgrpEA5hDqa4UqFy/vC9P4zwXb463UHYPtp2rdaHOKsKASFRUHCl83 57oclUC0xepcLfnJ44c7GDeSO14W5qPGIUBuyV2A+ZvAvMud6nlxhrJhLwsamIXzebAG V5dFgbD9NYzaoqc4fVlHz6yhTxI/OMBZ6Fqr4khAWu4lag5j7x7FB7EYKuIeX8vUH9fL H6+Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:content-transfer-encoding :content-language:accept-language:in-reply-to:references:message-id :date:thread-index:thread-topic:subject:cc:to:from:dkim-signature :dkim-signature; bh=Y292rx7edbDtONNI7C9W/pDUNiNqgVRhbZOsl62+7B8=; b=XwnSGbIoK2Gj73MqQOxQSQBckPR8QglSLXxh2Div6iYQzLLykTZ+M4+upHX6La65dH C517hDmSW6LKSfT0OM/eTJbFPzJpsPuUF/cxhfzsq8ZYGOU5yb7NA6vlno7StjzjFBHt DQw2NvqUQTFlF76900GLpb15ZQ6DuSM3xyykta4i1/rBxnPxuvJf+eSD5W6vh1FqeKjB VurDVRIWUVsDPdtZBdDpXV1HONZpW+3HAPjTmVg9fkAbQymugP+I2X6fv6XpBfQwkni/ VS7C+7i0vk5zUYGiRx9S9LJ853MigGoHW4vwEMc9Amhbpj2bTGn14hMqYCOA1lmUvy5y GfvA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@marvell.com header.s=pfpt0818 header.b=zQD1vLe4; dkim=pass header.i=@marvell.onmicrosoft.com header.s=selector2-marvell-onmicrosoft-com header.b=RKZ1nRpA; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=marvell.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id g10si10697753pjp.74.2019.06.24.08.09.26; Mon, 24 Jun 2019 08:09:27 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@marvell.com header.s=pfpt0818 header.b=zQD1vLe4; dkim=pass header.i=@marvell.onmicrosoft.com header.s=selector2-marvell-onmicrosoft-com header.b=RKZ1nRpA; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=marvell.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730551AbfFXPJZ (ORCPT + 30 others); Mon, 24 Jun 2019 11:09:25 -0400 Received: from mx0a-0016f401.pphosted.com ([67.231.148.174]:17790 "EHLO mx0b-0016f401.pphosted.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1729578AbfFXPJX (ORCPT ); Mon, 24 Jun 2019 11:09:23 -0400 Received: from pps.filterd (m0045849.ppops.net [127.0.0.1]) by mx0a-0016f401.pphosted.com (8.16.0.27/8.16.0.27) with SMTP id x5OF0N6l018740; Mon, 24 Jun 2019 08:09:15 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=marvell.com; h=from : to : cc : subject : date : message-id : references : in-reply-to : content-type : content-transfer-encoding : mime-version; s=pfpt0818; bh=Y292rx7edbDtONNI7C9W/pDUNiNqgVRhbZOsl62+7B8=; b=zQD1vLe4Trqq3eb77ACOAMbrvrzLJ/mdQ4iogzIDOvwaQCCiCFuicdp882g7aRhsNA/U fv5I+4QdTd05pQnSH5MjtIVmcz+lokx/7dSnJRRBVkN46Kk0cFue84oqhvTOFgW0tSJG E3pFXre728kr2R2Xaqp3wXe9xpX7NehBgiqUtv+JXQsXFUcB8qFFD2fDDgDRSdMBB4jH UYSPh7pDvS5JPS1jwYwEbyJ6Kc8DKAjPhtRWxavt9XnMd15pK/4Dr+Z81RaaUFVdiu/w gNdPeMYcK6EjJ1/kqlDPtPPIR4aAIN4xAEHNA1KXM5qaGw3s30OEElFiZx/gmZZ0oksT LA== Received: from sc-exch01.marvell.com ([199.233.58.181]) by mx0a-0016f401.pphosted.com with ESMTP id 2tarxr9ta1-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT); Mon, 24 Jun 2019 08:09:15 -0700 Received: from SC-EXCH04.marvell.com (10.93.176.84) by SC-EXCH01.marvell.com (10.93.176.81) with Microsoft SMTP Server (TLS) id 15.0.1367.3; Mon, 24 Jun 2019 08:09:14 -0700 Received: from NAM03-BY2-obe.outbound.protection.outlook.com (104.47.42.53) by SC-EXCH04.marvell.com (10.93.176.84) with Microsoft SMTP Server (TLS) id 15.0.1367.3 via Frontend Transport; Mon, 24 Jun 2019 08:09:14 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=marvell.onmicrosoft.com; s=selector2-marvell-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Y292rx7edbDtONNI7C9W/pDUNiNqgVRhbZOsl62+7B8=; b=RKZ1nRpAouOmi9yAJQ/zvBmn39g+7I5CWPRt8Hq3tGuX6lfb0jjjn3d9p9IKL5LggHp+YzP1foXSL1kUfBZcnsjgBqh7JXfYdhlm98PRiRpJedDluu3tgl8X0GDiGDU2lEYFJiNk0Ra4m3IMJ0WlkPJk+JJV0ZG78kw/rS/ej+g= Received: from MN2PR18MB3408.namprd18.prod.outlook.com (10.255.238.217) by MN2PR18MB2589.namprd18.prod.outlook.com (20.179.82.96) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2008.16; Mon, 24 Jun 2019 15:09:13 +0000 Received: from MN2PR18MB3408.namprd18.prod.outlook.com ([fe80::d3:794c:1b94:cf3]) by MN2PR18MB3408.namprd18.prod.outlook.com ([fe80::d3:794c:1b94:cf3%4]) with mapi id 15.20.2008.014; Mon, 24 Jun 2019 15:09:13 +0000 From: Robert Richter To: Borislav Petkov , James Morse , "Mauro Carvalho Chehab" CC: "linux-edac@vger.kernel.org" , "linux-kernel@vger.kernel.org" , Robert Richter Subject: [PATCH v2 09/24] EDAC, mc: Cleanup _edac_mc_free() code Thread-Topic: [PATCH v2 09/24] EDAC, mc: Cleanup _edac_mc_free() code Thread-Index: AQHVKp7Isx66NqK27UO6ldD/Ux6kpw== Date: Mon, 24 Jun 2019 15:09:13 +0000 Message-ID: <20190624150758.6695-10-rrichter@marvell.com> References: <20190624150758.6695-1-rrichter@marvell.com> In-Reply-To: <20190624150758.6695-1-rrichter@marvell.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: HE1P190CA0035.EURP190.PROD.OUTLOOK.COM (2603:10a6:7:52::24) To MN2PR18MB3408.namprd18.prod.outlook.com (2603:10b6:208:16c::25) x-ms-exchange-messagesentrepresentingtype: 1 x-mailer: git-send-email 2.20.1 x-originating-ip: [92.254.182.202] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: b9a039d0-0f6a-4ec2-fe51-08d6f8b5eac6 x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600148)(711020)(4605104)(1401327)(2017052603328)(7193020); SRVR:MN2PR18MB2589; x-ms-traffictypediagnostic: MN2PR18MB2589: x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:1013; x-forefront-prvs: 007814487B x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(396003)(39860400002)(346002)(376002)(366004)(136003)(189003)(199004)(2906002)(2616005)(486006)(476003)(52116002)(256004)(5660300002)(66446008)(73956011)(66946007)(1076003)(14454004)(6116002)(86362001)(3846002)(99286004)(6486002)(68736007)(81166006)(81156014)(6436002)(4326008)(305945005)(50226002)(53936002)(7736002)(8676002)(8936002)(478600001)(64756008)(66556008)(66476007)(6512007)(107886003)(71190400001)(71200400001)(36756003)(26005)(102836004)(386003)(186003)(11346002)(76176011)(6506007)(110136005)(316002)(54906003)(446003)(25786009)(66066001); DIR:OUT; SFP:1101; SCL:1; SRVR:MN2PR18MB2589; H:MN2PR18MB3408.namprd18.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; received-spf: None (protection.outlook.com: marvell.com does not designate permitted sender hosts) x-ms-exchange-senderadcheck: 1 x-microsoft-antispam-message-info: jkDw62OY23uBhDRjNp91MVXJCRJwfehuekgVp9eBCG003v9b1vLLKQBoiFyHM6TwdcRR2ofyjkUTCTOsouTgJNJz4rpfg0IkfRr5vE2nkcpDEEEGhJMxEwCkAXqk1PcHBm1gp7Lvc42aZPeDwqEFEWbiqiijrCBaJbagNb5kSlNQTga6/K2Y6JX4ETnG98i8ank6XgCFWr78FtGWNGAXSWXMDigPHOcUlX5s0xPIRmxk+WN6hvaNjbT6CXBuUtUsvW8ckyzwm+4JxWjNwTxpQj9MduW6xLIfxRpU9a/RJGq/OsIimhXYI12eUKIxN595UMc+/GtHlydemNWchBzD40XnJ2Tb0OsLwiYpZBtM53cMQL4veNSEez7svhgTgddeRYNgf4L3wko5n6KLbRnsIilxPijJt2UZfn1d9N3pdc8= MIME-Version: 1.0 X-MS-Exchange-CrossTenant-Network-Message-Id: b9a039d0-0f6a-4ec2-fe51-08d6f8b5eac6 X-MS-Exchange-CrossTenant-originalarrivaltime: 24 Jun 2019 15:09:13.3951 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 70e1fb47-1155-421d-87fc-2e58f638b6e0 X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: rrichter@marvell.com X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR18MB2589 X-OriginatorOrg: marvell.com X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:, , definitions=2019-06-24_10:, , signatures=0 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Remove needless and boilerplate variable declarations. No functional changes. Signed-off-by: Robert Richter --- drivers/edac/edac_mc.c | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) -- 2.20.1 diff --git a/drivers/edac/edac_mc.c b/drivers/edac/edac_mc.c index 27277ca46ab3..f2acdab34eb7 100644 --- a/drivers/edac/edac_mc.c +++ b/drivers/edac/edac_mc.c @@ -280,26 +280,23 @@ static void _edac_mc_free(struct mem_ctl_info *mci) { int i, chn, row; struct csrow_info *csr; - const unsigned int tot_dimms = mci->tot_dimms; - const unsigned int tot_channels = mci->num_cschannel; - const unsigned int tot_csrows = mci->nr_csrows; if (mci->dimms) { - for (i = 0; i < tot_dimms; i++) + for (i = 0; i < mci->tot_dimms; i++) kfree(mci->dimms[i]); kfree(mci->dimms); } if (mci->csrows) { - for (row = 0; row < tot_csrows; row++) { + for (row = 0; row < mci->nr_csrows; row++) { csr = mci->csrows[row]; - if (csr) { - if (csr->channels) { - for (chn = 0; chn < tot_channels; chn++) - kfree(csr->channels[chn]); - kfree(csr->channels); - } - kfree(csr); + if (!csr) + continue; + if (csr->channels) { + for (chn = 0; chn < mci->num_cschannel; chn++) + kfree(csr->channels[chn]); + kfree(csr->channels); } + kfree(csr); } kfree(mci->csrows); }