From: Prashant Malani <pmalani@chromium.org>
To: enric.balletbo@collabora.com, groeck@chromium.org,
bleung@chromium.org, lee.jones@linaro.org, sre@kernel.org
Cc: linux-kernel@vger.kernel.org, linux-pm@vger.kernel.org,
Prashant Malani <pmalani@chromium.org>
Subject: [PATCH v8 3/4] mfd: cros_ec: Check DT node for usbpd-notify add
Date: Fri, 24 Jan 2020 15:18:36 -0800 [thread overview]
Message-ID: <20200124231834.63628-3-pmalani@chromium.org> (raw)
In-Reply-To: <20200124231834.63628-1-pmalani@chromium.org>
Add a check to ensure there is indeed an EC device tree entry before
adding the cros-usbpd-notify device. This covers configs where both
CONFIG_ACPI and CONFIG_OF are defined, but the EC device is defined
using device tree and not in ACPI.
Signed-off-by: Prashant Malani <pmalani@chromium.org>
---
Changes in v8:
- Patch first introduced in v8 of the series.
drivers/mfd/cros_ec_dev.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/mfd/cros_ec_dev.c b/drivers/mfd/cros_ec_dev.c
index d0c28a4c10ad0..411e80fc9a066 100644
--- a/drivers/mfd/cros_ec_dev.c
+++ b/drivers/mfd/cros_ec_dev.c
@@ -212,7 +212,7 @@ static int ec_device_probe(struct platform_device *pdev)
* explicitly added on platforms that don't have the PD notifier ACPI
* device entry defined.
*/
- if (IS_ENABLED(CONFIG_OF)) {
+ if (IS_ENABLED(CONFIG_OF) && ec->ec_dev->dev->of_node) {
if (cros_ec_check_features(ec, EC_FEATURE_USB_PD)) {
retval = mfd_add_hotplug_devices(ec->dev,
cros_usbpd_notify_cells,
--
2.25.0.341.g760bfbb309-goog
next prev parent reply other threads:[~2020-01-24 23:25 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-24 23:18 [PATCH v8 1/4] platform: chrome: Add cros-usbpd-notify driver Prashant Malani
2020-01-24 23:18 ` [PATCH v8 2/4] mfd: cros_ec: Add cros-usbpd-notify subdevice Prashant Malani
2020-01-24 23:18 ` Prashant Malani [this message]
2020-01-27 14:50 ` [PATCH v8 3/4] mfd: cros_ec: Check DT node for usbpd-notify add Enric Balletbo i Serra
2020-02-10 10:11 ` Enric Balletbo i Serra
[not found] ` <CACeCKadtoAA0z88dYy3O-tQE=KLpR5Rx=ZXkkEKyhnAsKyqzjw@mail.gmail.com>
2020-02-10 16:38 ` Enric Balletbo i Serra
2020-02-10 18:59 ` Prashant Malani
2020-02-24 10:27 ` Lee Jones
2020-01-24 23:18 ` [PATCH v8 4/4] power: supply: cros-ec-usbpd-charger: Fix host events Prashant Malani
2020-01-27 14:58 ` [PATCH v8 1/4] platform: chrome: Add cros-usbpd-notify driver Enric Balletbo i Serra
2020-01-27 17:19 ` Prashant Malani
2020-01-27 18:44 ` Benson Leung
2020-01-29 1:11 ` Prashant Malani
2020-01-29 8:37 ` Enric Balletbo i Serra
2020-02-03 23:42 ` Benson Leung
2020-02-04 0:40 ` Prashant Malani
2020-02-10 1:24 ` Benson Leung
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=20200124231834.63628-3-pmalani@chromium.org \
--to=pmalani@chromium.org \
--cc=bleung@chromium.org \
--cc=enric.balletbo@collabora.com \
--cc=groeck@chromium.org \
--cc=lee.jones@linaro.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=sre@kernel.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).