Received: by 2002:a25:ad19:0:0:0:0:0 with SMTP id y25csp7453768ybi; Mon, 22 Jul 2019 13:32:26 -0700 (PDT) X-Google-Smtp-Source: APXvYqx+l3ospaqLjpgxRl8zjjwUahwkIwRmRbwGOhq49jgGMnNz8IAES8oUH2sYEDh+97sUgXk1 X-Received: by 2002:a17:90a:2768:: with SMTP id o95mr78510965pje.37.1563827546524; Mon, 22 Jul 2019 13:32:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1563827546; cv=none; d=google.com; s=arc-20160816; b=hG4MDDOY4b1dSzE25toQJQT71Kcb/EQAypeEg0xLiQ6z4p11CYFUBWM92cEqHZBgQ3 vfqem4W7CyA3KSSETSx5Xjjs5jMq2q+bpPxEGabzK7B1gk4ejnD4oeXMe4ZuPJfb1MEM 6xozn8dRKHzxcHizqXrvYhNduIOwuE4SxTozFdtx3KCrsFd5pSVLdLgxi6CLdwQT0/iE w5D8ZGG1AFL36jLNSXgxqLo4TYFojhx/sPSKRXFF8hEgAeCdaUJgzC9s6NBsd57VmoPk BRd0ISfm6+fMmXPbdKArsJE6tQSzc9U5P36CL9TrzUkQpLWhIM24s5XpA6jes3BEHdrC m0fQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from; bh=/SLEBS1SVsJV0at+/eJtqJZpBJ9DqvmDAw13anogDqo=; b=AvT8a5iUgblN7OnZXNkq0S94v3WNwLX6RLcwXcA8JSUrCDQXcPMMUP97HtnkgINkUW a38KHjTZ4C1mulGu8XpREHcgEXMyk2/EORJzIGEWDIRMuHRM/aIYmS29B3U+WxE3nsdT FMkIWwj0swYXFZapn7BihOmKJGOQ5nM9NCGwURTdCC7QKXyoxTMx6u/7+pYziYRfeQoN ptgXI/ta9N3f81HrbQeFtSCdrekpQ8RuKYrsBPDG5EumpAOGv7HyZlrCz6hvcVqWInNu aRYdhUIGYwkQZzkSXEr2/AkA6RtulbWShm0CLWtlb77Y2He9r8pp36KhqidCUn6NrP/d XkJQ== ARC-Authentication-Results: i=1; mx.google.com; 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 Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id o21si12206756pgm.453.2019.07.22.13.32.10; Mon, 22 Jul 2019 13:32:26 -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; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730713AbfGVQOl (ORCPT + 99 others); Mon, 22 Jul 2019 12:14:41 -0400 Received: from foss.arm.com ([217.140.110.172]:41430 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728762AbfGVQOk (ORCPT ); Mon, 22 Jul 2019 12:14:40 -0400 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id CA2E028; Mon, 22 Jul 2019 09:14:39 -0700 (PDT) Received: from e121166-lin.cambridge.arm.com (unknown [10.1.196.255]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 746C83F694; Mon, 22 Jul 2019 09:14:38 -0700 (PDT) From: Lorenzo Pieralisi To: linux-acpi@vger.kernel.org Cc: Lorenzo Pieralisi , Will Deacon , Hanjun Guo , Sudeep Holla , Catalin Marinas , Robin Murphy , Kefeng Wang , LKML , LAKML Subject: [PATCH] ACPI/IORT: Rename arm_smmu_v3_set_proximity() 'node' local variable Date: Mon, 22 Jul 2019 17:14:33 +0100 Message-Id: <20190722161433.23027-1-lorenzo.pieralisi@arm.com> X-Mailer: git-send-email 2.21.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit 36a2ba07757d ("ACPI/IORT: Reject platform device creation on NUMA node mapping failure") introduced a local variable 'node' in arm_smmu_v3_set_proximity() that shadows the struct acpi_iort_node pointer function parameter. Execution was unaffected but it is prone to errors and can lead to subtle bugs. Rename the local variable to prevent any issue. Reported-by: Will Deacon Signed-off-by: Lorenzo Pieralisi Cc: Will Deacon Cc: Hanjun Guo Cc: Sudeep Holla Cc: Catalin Marinas Cc: Robin Murphy Cc: Kefeng Wang --- drivers/acpi/arm64/iort.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/acpi/arm64/iort.c b/drivers/acpi/arm64/iort.c index d4551e33fa71..15dbfd657d82 100644 --- a/drivers/acpi/arm64/iort.c +++ b/drivers/acpi/arm64/iort.c @@ -1256,12 +1256,12 @@ static int __init arm_smmu_v3_set_proximity(struct device *dev, smmu = (struct acpi_iort_smmu_v3 *)node->node_data; if (smmu->flags & ACPI_IORT_SMMU_V3_PXM_VALID) { - int node = acpi_map_pxm_to_node(smmu->pxm); + int dev_node = acpi_map_pxm_to_node(smmu->pxm); - if (node != NUMA_NO_NODE && !node_online(node)) + if (dev_node != NUMA_NO_NODE && !node_online(dev_node)) return -EINVAL; - set_dev_node(dev, node); + set_dev_node(dev, dev_node); pr_info("SMMU-v3[%llx] Mapped to Proximity domain %d\n", smmu->base_address, smmu->pxm); -- 2.21.0