linux-acpi.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Ocean He <oceanhehy-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
To: dan.j.williams-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org,
	ross.zwisler-VuQAYsv1563Yd54FQh9/CA@public.gmane.org,
	vishal.l.verma-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org,
	dave.jiang-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org,
	rjw-LthD3rsA81gm4RdzfppkhA@public.gmane.org,
	lenb-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org
Cc: linux-acpi-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
	Ocean He <hehy1-6jq1YtArVR3QT0dZR+AlfA@public.gmane.org>,
	linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
	linux-nvdimm-hn68Rpc1hR1g9hUCZPvPmw@public.gmane.org
Subject: [PATCH] ACPI: nfit: check dcr immediately following its assignment codes
Date: Wed,  8 Aug 2018 10:50:21 -0400	[thread overview]
Message-ID: <1533739821-9864-1-git-send-email-oceanhehy@gmail.com> (raw)

From: Ocean He <hehy1-6jq1YtArVR3QT0dZR+AlfA@public.gmane.org>

In commit 6697b2cf69d43632 ("nfit: fix multi-interface dimm handling,
acpi6.1 compatibility"), the check codes of dcr were just following its
assignment codes. But they were separated by commit ad9ac5e1957531a8
("nfit: always associate flush hints").

Just change the check codes back to original position, without function
change.

Signed-off-by: Ocean He <hehy1-6jq1YtArVR3QT0dZR+AlfA@public.gmane.org>
---
 drivers/acpi/nfit/core.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/drivers/acpi/nfit/core.c b/drivers/acpi/nfit/core.c
index 7c47900..c9e4c9a 100644
--- a/drivers/acpi/nfit/core.c
+++ b/drivers/acpi/nfit/core.c
@@ -1078,6 +1078,12 @@ static int __nfit_mem_init(struct acpi_nfit_desc *acpi_desc,
 			break;
 		}
 
+		if (dcr && !nfit_mem->dcr) {
+			dev_err(acpi_desc->dev, "SPA %d missing DCR %d\n",
+					spa->range_index, dcr);
+			return -ENODEV;
+		}
+
 		list_for_each_entry(nfit_flush, &acpi_desc->flushes, list) {
 			struct acpi_nfit_flush_address *flush;
 			u16 i;
@@ -1101,12 +1107,6 @@ static int __nfit_mem_init(struct acpi_nfit_desc *acpi_desc,
 			break;
 		}
 
-		if (dcr && !nfit_mem->dcr) {
-			dev_err(acpi_desc->dev, "SPA %d missing DCR %d\n",
-					spa->range_index, dcr);
-			return -ENODEV;
-		}
-
 		if (type == NFIT_SPA_DCR) {
 			struct nfit_idt *nfit_idt;
 			u16 idt_idx;
-- 
1.8.3.1

             reply	other threads:[~2018-08-08 14:50 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-08-08 14:50 Ocean He [this message]
     [not found] ` <1533739821-9864-1-git-send-email-oceanhehy-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2018-08-08 17:42   ` [PATCH] ACPI: nfit: check dcr immediately following its assignment codes Verma, Vishal L
     [not found]     ` <1533750167.7673.0.camel-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>
2018-08-09  1:35       ` [External] " Ocean HY1 He

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1533739821-9864-1-git-send-email-oceanhehy@gmail.com \
    --to=oceanhehy-re5jqeeqqe8avxtiumwx3w@public.gmane.org \
    --cc=dan.j.williams-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org \
    --cc=dave.jiang-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org \
    --cc=hehy1-6jq1YtArVR3QT0dZR+AlfA@public.gmane.org \
    --cc=lenb-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org \
    --cc=linux-acpi-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
    --cc=linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
    --cc=linux-nvdimm-hn68Rpc1hR1g9hUCZPvPmw@public.gmane.org \
    --cc=rjw-LthD3rsA81gm4RdzfppkhA@public.gmane.org \
    --cc=ross.zwisler-VuQAYsv1563Yd54FQh9/CA@public.gmane.org \
    --cc=vishal.l.verma-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).