Re: [PATCH v8 3/4] mfd: cros_ec: Check DT node for usbpd-notify add

From: Enric Balletbo i Serra
Date: Mon Jan 27 2020 - 09:50:09 EST


Hi Prashant,

On 25/1/20 0:18, Prashant Malani wrote:
> 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@xxxxxxxxxxxx>

With this change, an playing with different CONFIG_ACPI + CONFIG_OF combinations
I don't see anymore the problem where the driver is registered twice on
CONFIG_ACPI side. So,

Tested-by: Enric Balletbo i Serra <enric.balletbo@xxxxxxxxxxxxx>

Maybe it requires a fixes tag if Lee already picked the other patch?

Fixes: 4602dce0361e ("mfd: cros_ec: Add cros-usbpd-notify subdevice")

> ---
>
> 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,
>