LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
From: John Garry <john.garry@huawei.com>
To: <rjw@rjwysocki.net>, <andriy.shevchenko@linux.intel.com>,
	<linux-acpi@vger.kernel.org>, <lenb@kernel.org>,
	<mika.westerberg@linux.intel.com>, <lorenzo.pieralisi@arm.com>
Cc: <linux-kernel@vger.kernel.org>, <arnd@arndb.de>,
	<graeme.gregory@linaro.org>, <helgaas@kernel.org>,
	<linuxarm@huawei.com>, <z.liuxinliang@hisilicon.com>,
	John Garry <john.garry@huawei.com>
Subject: [RFC PATCH 1/2] ACPI / PNP: Don't add "enumeration_by_parent" devices
Date: Fri, 20 Apr 2018 18:07:25 +0800	[thread overview]
Message-ID: <1524218846-169934-2-git-send-email-john.garry@huawei.com> (raw)
In-Reply-To: <1524218846-169934-1-git-send-email-john.garry@huawei.com>

For ACPI devices with the enumeration_by_parent flag set,
we expect the parent device to enumerate the device after
the ACPI scan.

This patch does partially the same for devices which are
enumerated as PNP devices.

We still want PNP scan code to create the per-ACPI device
PNP device, but hold off adding the device to allow the
parent to do this optionally.

Flag acpi_device.driver_data is used as temp store as a
reference to the PNP device for the parent.

Signed-off-by: John Garry <john.garry@huawei.com>
---
 drivers/pnp/pnpacpi/core.c | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/drivers/pnp/pnpacpi/core.c b/drivers/pnp/pnpacpi/core.c
index 3a4c1aa..92f9d6f 100644
--- a/drivers/pnp/pnpacpi/core.c
+++ b/drivers/pnp/pnpacpi/core.c
@@ -285,10 +285,14 @@ static int __init pnpacpi_add_device(struct acpi_device *device)
 	if (!dev->active)
 		pnp_init_resources(dev);
 
-	error = pnp_add_device(dev);
-	if (error) {
-		put_device(&dev->dev);
-		return error;
+	if (!device->flags.enumeration_by_parent) {
+		error = pnp_add_device(dev);
+		if (error) {
+			put_device(&dev->dev);
+			return error;
+		}
+	} else {
+		device->driver_data = dev;
 	}
 
 	num++;
-- 
1.9.1

  reply	other threads:[~2018-04-20 10:08 UTC|newest]

Thread overview: 24+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-04-20 10:07 [RFC PATCH 0/2] HISI LPC: Add PNP device support John Garry
2018-04-20 10:07 ` John Garry [this message]
2018-04-20 13:07   ` [RFC PATCH 1/2] ACPI / PNP: Don't add "enumeration_by_parent" devices Mika Westerberg
2018-04-20 13:24     ` John Garry
2018-04-20 13:52       ` Mika Westerberg
2018-04-20 14:09         ` John Garry
2018-04-26 13:49           ` John Garry
2018-04-26 14:08             ` Mika Westerberg
2018-04-26 14:23               ` John Garry
2018-04-26 14:40                 ` Mika Westerberg
2018-04-27  9:17                 ` John Garry
2018-04-30  5:36                   ` Lee Jones
2018-04-30  9:00                     ` John Garry
2018-04-30  9:26                       ` Lee Jones
2018-04-30  9:35                         ` John Garry
2018-04-30 10:46                           ` Lee Jones
2018-04-30 10:57                             ` John Garry
2018-04-20 10:07 ` [RFC PATCH 2/2] HISI LPC: Add PNP device support John Garry
2018-04-20 12:50   ` Andy Shevchenko
2018-04-20 13:09     ` John Garry
2018-04-20 13:28       ` Andy Shevchenko
2018-04-20 13:32         ` John Garry
2018-04-20 13:12   ` Mika Westerberg
2018-04-20 13:36     ` John Garry

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=1524218846-169934-2-git-send-email-john.garry@huawei.com \
    --to=john.garry@huawei.com \
    --cc=andriy.shevchenko@linux.intel.com \
    --cc=arnd@arndb.de \
    --cc=graeme.gregory@linaro.org \
    --cc=helgaas@kernel.org \
    --cc=lenb@kernel.org \
    --cc=linux-acpi@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linuxarm@huawei.com \
    --cc=lorenzo.pieralisi@arm.com \
    --cc=mika.westerberg@linux.intel.com \
    --cc=rjw@rjwysocki.net \
    --cc=z.liuxinliang@hisilicon.com \
    --subject='Re: [RFC PATCH 1/2] ACPI / PNP: Don'\''t add "enumeration_by_parent" devices' \
    /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

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).