From: Wei Yang <richardw.yang@linux.intel.com>
Date: Tue, 15 Jan 2019 03:09:46 +0000 (+0800)
Subject: acpi/nfit: Remove duplicate set nd_set in acpi_nfit_init_interleave_set()
X-Git-Tag: v5.0-rc3~12^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b4fe30e45a660efa8f122070fc7173715d0e1d00;p=thirdparty%2Fkernel%2Flinux.git

acpi/nfit: Remove duplicate set nd_set in acpi_nfit_init_interleave_set()

We allocate nd_set in acpi_nfit_init_interleave_set() and assignn it to
ndr_desc, while the assignment is done twice in this function.

This patch removes the first assignment. No functional change.

Signed-off-by: Wei Yang <richardw.yang@linux.intel.com>
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
---

diff --git a/drivers/acpi/nfit/core.c b/drivers/acpi/nfit/core.c
index 790691d9a9822..5143e11e3b0fa 100644
--- a/drivers/acpi/nfit/core.c
+++ b/drivers/acpi/nfit/core.c
@@ -2226,7 +2226,6 @@ static int acpi_nfit_init_interleave_set(struct acpi_nfit_desc *acpi_desc,
 	nd_set = devm_kzalloc(dev, sizeof(*nd_set), GFP_KERNEL);
 	if (!nd_set)
 		return -ENOMEM;
-	ndr_desc->nd_set = nd_set;
 	guid_copy(&nd_set->type_guid, (guid_t *) spa->range_guid);
 
 	info = devm_kzalloc(dev, sizeof_nfit_set_info(nr), GFP_KERNEL);