From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from NAM03-DM3-obe.outbound.protection.outlook.com (mail-dm3nam03on0717.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe49::717]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 8D9BC8034A for ; Tue, 7 Mar 2017 16:20:44 -0800 (PST) Subject: Re: [PATCH 3/5] acpi: cleanup acpi_nfit_ctl calling xlat_status References: <148883211285.49239.17952572594430933942.stgit@djiang5-desk3.ch.intel.com> <148883236278.49239.9457895421265109054.stgit@djiang5-desk3.ch.intel.com> From: Linda Knippers Message-ID: <58BF4E4D.8000406@hpe.com> Date: Tue, 7 Mar 2017 19:20:29 -0500 MIME-Version: 1.0 In-Reply-To: <148883236278.49239.9457895421265109054.stgit@djiang5-desk3.ch.intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: linux-nvdimm-bounces@lists.01.org Sender: "Linux-nvdimm" To: Dave Jiang , dan.j.williams@intel.com Cc: linux-nvdimm@lists.01.org List-ID: On 03/06/2017 03:32 PM, Dave Jiang wrote: > Make sure that xlat_status is unconditionally called. Is this just code cleanup or is it fixing something? > > Signed-off-by: Dave Jiang > --- > drivers/acpi/nfit/core.c | 15 +++++++-------- > 1 file changed, 7 insertions(+), 8 deletions(-) > > diff --git a/drivers/acpi/nfit/core.c b/drivers/acpi/nfit/core.c > index 7361d00..9d4f461 100644 > --- a/drivers/acpi/nfit/core.c > +++ b/drivers/acpi/nfit/core.c > @@ -199,7 +199,7 @@ int acpi_nfit_ctl(struct nvdimm_bus_descriptor *nd_desc, struct nvdimm *nvdimm, > acpi_handle handle; > unsigned int func; > const u8 *uuid; > - int rc, i; > + int rc = 0, xlat_rc, i; > > func = cmd; > if (cmd == ND_CMD_CALL) { > @@ -343,21 +343,20 @@ int acpi_nfit_ctl(struct nvdimm_bus_descriptor *nd_desc, struct nvdimm *nvdimm, > * unfilled in the output buffer > */ > rc = buf_len - offset - in_buf.buffer.length; > - if (cmd_rc) > - *cmd_rc = xlat_status(nvdimm, buf, cmd, > - fw_status); > } else { > dev_err(dev, "%s:%s underrun cmd: %s buf_len: %d out_len: %d\n", > __func__, dimm_name, cmd_name, buf_len, > offset); > rc = -ENXIO; > + goto out; > } > - } else { > - rc = 0; > - if (cmd_rc) > - *cmd_rc = xlat_status(nvdimm, buf, cmd, fw_status); > } > > + xlat_rc = xlat_status(nvdimm, buf, cmd, fw_status); > + > + if (cmd_rc) > + *cmd_rc = xlat_rc; Is there some benefit of calling xlat_status and then throwing away the result? > + > out: > ACPI_FREE(out_obj); > > > _______________________________________________ > Linux-nvdimm mailing list > Linux-nvdimm@lists.01.org > https://lists.01.org/mailman/listinfo/linux-nvdimm > _______________________________________________ Linux-nvdimm mailing list Linux-nvdimm@lists.01.org https://lists.01.org/mailman/listinfo/linux-nvdimm