diff options
| author | Victor Liu <victorliu@google.com> | 2024-03-08 11:13:06 -0800 |
|---|---|---|
| committer | Victor Liu <victorliu@google.com> | 2024-03-12 20:23:47 +0000 |
| commit | d28772fb6f9a4bc2932238c3d0710002b4a9f690 (patch) | |
| tree | 3cccb7b64a36d9a5824705fe1d51976c4e7f92a8 | |
| parent | 4d7c490fd2d9911e78b411e36a7e2b682daf2c8f (diff) | |
| download | qm35-d28772fb6f9a4bc2932238c3d0710002b4a9f690.tar.gz | |
add qm35s support for 5.x kernel [DO NOT MERGE]
Bug: 327447971
Change-Id: I4c615c124359f7a54f6904bcbf98c31b95dec28b
Signed-off-by: Victor Liu <victorliu@google.com>
| -rw-r--r-- | qm35s/qm35-spi.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/qm35s/qm35-spi.c b/qm35s/qm35-spi.c index 0789f90..49063f1 100644 --- a/qm35s/qm35-spi.c +++ b/qm35s/qm35-spi.c @@ -1052,7 +1052,7 @@ poweroff: return ret; } -static void qm35_remove(struct spi_device *spi) +static int qm35_remove(struct spi_device *spi) { struct qm35_ctx *qm35_hdl = spi_get_drvdata(spi); @@ -1077,6 +1077,8 @@ static void qm35_remove(struct spi_device *spi) dev_info(&spi->dev, "Deregistered: [%s] misc device\n", qm35_hdl->uci_dev.name); + + return 0; } #ifdef CONFIG_PM_SLEEP @@ -1101,6 +1103,7 @@ static int qm35_pm_resume(struct device *dev) static SIMPLE_DEV_PM_OPS(qm35_spi_ops, qm35_pm_suspend, qm35_pm_resume); +#define pm_sleep_ptr(_ptr) (IS_ENABLED(CONFIG_PM_SLEEP) ? (_ptr) : NULL) static struct spi_driver qm35_spi_driver = { .driver = { .name = "qm35", |