The 1st patch fixes unhandled undos in error handling path.
The rest of patches cleans drivers/platform/chrome/cros_ec.c.
Changes from v3:
(https://patchwork.kernel.org/project/chrome-platform/cover/[email protected]/)
- Drop "platform/chrome: cros_ec: don't initialize `err` in cros_ec_register()".
- Rename the 3rd patch's title.
Changes from v2:
(https://patchwork.kernel.org/project/chrome-platform/cover/[email protected]/)
- Fix review comments in 1st and 2nd patch.
Changes from v1:
(https://lore.kernel.org/lkml/[email protected]/T/#u)
- Use imperative mood in commit messages.
- Use IS_ERR_OR_NULL() in 1st patch.
Tzung-Bi Shih (5):
platform/chrome: cros_ec: fix error handling in cros_ec_register()
platform/chrome: cros_ec: remove unused variable `was_wake_device`
platform/chrome: cros_ec: initialize `wake_enabled` in
cros_ec_register()
platform/chrome: cros_ec: sort header inclusion alphabetically
platform/chrome: cros_ec: append newline to all logs
drivers/platform/chrome/cros_ec.c | 35 +++++++++++----------
include/linux/platform_data/cros_ec_proto.h | 3 --
2 files changed, 19 insertions(+), 19 deletions(-)
--
2.35.1.265.g69c8d7142f-goog
Reviewed-by: Prashant Malani <[email protected]>
Signed-off-by: Tzung-Bi Shih <[email protected]>
---
No changes from v3.
Changes from v2:
(https://patchwork.kernel.org/project/chrome-platform/patch/[email protected]/)
- Add pmalani's R-b tag.
- Remove redundant commit message.
Changes from v1:
(https://lore.kernel.org/lkml/[email protected]/T/#u)
- Use imperative mood in commit message.
drivers/platform/chrome/cros_ec.c | 1 -
include/linux/platform_data/cros_ec_proto.h | 3 ---
2 files changed, 4 deletions(-)
diff --git a/drivers/platform/chrome/cros_ec.c b/drivers/platform/chrome/cros_ec.c
index ff2a24b0c611..25cd8df6e7b0 100644
--- a/drivers/platform/chrome/cros_ec.c
+++ b/drivers/platform/chrome/cros_ec.c
@@ -344,7 +344,6 @@ int cros_ec_suspend(struct cros_ec_device *ec_dev)
ec_dev->wake_enabled = !enable_irq_wake(ec_dev->irq);
disable_irq(ec_dev->irq);
- ec_dev->was_wake_device = ec_dev->wake_enabled;
ec_dev->suspended = true;
return 0;
diff --git a/include/linux/platform_data/cros_ec_proto.h b/include/linux/platform_data/cros_ec_proto.h
index df3c78c92ca2..c65971ec90ea 100644
--- a/include/linux/platform_data/cros_ec_proto.h
+++ b/include/linux/platform_data/cros_ec_proto.h
@@ -76,8 +76,6 @@ struct cros_ec_command {
* struct cros_ec_device - Information about a ChromeOS EC device.
* @phys_name: Name of physical comms layer (e.g. 'i2c-4').
* @dev: Device pointer for physical comms device
- * @was_wake_device: True if this device was set to wake the system from
- * sleep at the last suspend.
* @cros_class: The class structure for this device.
* @cmd_readmem: Direct read of the EC memory-mapped region, if supported.
* @offset: Is within EC_LPC_ADDR_MEMMAP region.
@@ -137,7 +135,6 @@ struct cros_ec_device {
/* These are used by other drivers that want to talk to the EC */
const char *phys_name;
struct device *dev;
- bool was_wake_device;
struct class *cros_class;
int (*cmd_readmem)(struct cros_ec_device *ec, unsigned int offset,
unsigned int bytes, void *dest);
--
2.35.1.265.g69c8d7142f-goog