diff options
| author | Enric Balletbo i Serra <enric.balletbo@collabora.com> | 2019-09-02 19:02:02 +0200 |
|---|---|---|
| committer | Enric Balletbo i Serra <enric.balletbo@collabora.com> | 2019-09-02 19:02:02 +0200 |
| commit | 7e0bb52d0df9bbe4aa82847c243644848d914872 (patch) | |
| tree | 54e7f42c819ae378d809e01b9e5af261204985bb /drivers/platform/chrome/cros_ec_rpmsg.c | |
| parent | platform/chrome: cros_ec_rpmsg: Add host command AP sleep state support (diff) | |
| parent | mfd: cros_ec: Use mfd_add_hotplug_devices() helper (diff) | |
| download | linux-7e0bb52d0df9bbe4aa82847c243644848d914872.tar.xz linux-7e0bb52d0df9bbe4aa82847c243644848d914872.zip | |
Merge tag 'ib-mfd-extcon-hid-i2c-iio-input-media-chrome-power-pwm-rtc-sound-v5.4' into chrome-platform/for-next
Immutable branch between MFD, Extcon, HID, I2C, IIO, Input, Chrome, Power,
PWM, RTC and Sound to allow picking patches that depends on the series
that moves some code from the MFD subsystem to platform/chrome.
Signed-off-by: Enric Balletbo i Serra <enric.balletbo@collabora.com>
Diffstat (limited to 'drivers/platform/chrome/cros_ec_rpmsg.c')
| -rw-r--r-- | drivers/platform/chrome/cros_ec_rpmsg.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/platform/chrome/cros_ec_rpmsg.c b/drivers/platform/chrome/cros_ec_rpmsg.c index 6f34fe629e2c..8b6bd775cc9a 100644 --- a/drivers/platform/chrome/cros_ec_rpmsg.c +++ b/drivers/platform/chrome/cros_ec_rpmsg.c @@ -6,9 +6,9 @@ #include <linux/delay.h> #include <linux/kernel.h> #include <linux/module.h> -#include <linux/mfd/cros_ec.h> -#include <linux/mfd/cros_ec_commands.h> #include <linux/of.h> +#include <linux/platform_data/cros_ec_commands.h> +#include <linux/platform_data/cros_ec_proto.h> #include <linux/platform_device.h> #include <linux/rpmsg.h> #include <linux/slab.h> @@ -233,6 +233,8 @@ static void cros_ec_rpmsg_remove(struct rpmsg_device *rpdev) struct cros_ec_device *ec_dev = dev_get_drvdata(&rpdev->dev); struct cros_ec_rpmsg *ec_rpmsg = ec_dev->priv; + cros_ec_unregister(ec_dev); + cancel_work_sync(&ec_rpmsg->host_event_work); } |