diff options
| author | Andi Shyti <andi.shyti@kernel.org> | 2026-09-09 19:00:04 +0200 |
|---|---|---|
| committer | Andi Shyti <andi.shyti@kernel.org> | 2026-09-09 19:00:04 +0200 |
| commit | e817a366cd24ddc8f986ef43c5d54cc3f60b0c21 (patch) | |
| tree | 17aba329aa8defa56293d2aff49d6b8bf31e0658 | |
| parent | 8d158155d14cae1c8bbafaa950af06443609d564 (diff) | |
| parent | b1218b8e5fe5202c6b6bc3d9ce7b0c390f195274 (diff) | |
| download | linux-next-e817a366cd24ddc8f986ef43c5d54cc3f60b0c21.tar.gz linux-next-e817a366cd24ddc8f986ef43c5d54cc3f60b0c21.zip | |
Merge branch 'i2c/i2c' into i2c/i2c-next
| -rw-r--r-- | drivers/i2c/busses/i2c-qcom-geni.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/drivers/i2c/busses/i2c-qcom-geni.c b/drivers/i2c/busses/i2c-qcom-geni.c index 942cfeee99ba..7e4e46a30b58 100644 --- a/drivers/i2c/busses/i2c-qcom-geni.c +++ b/drivers/i2c/busses/i2c-qcom-geni.c @@ -1212,7 +1212,7 @@ static void geni_i2c_shutdown(struct platform_device *pdev) i2c_mark_adapter_suspended(&gi2c->adap); } -static int __maybe_unused geni_i2c_runtime_suspend(struct device *dev) +static int geni_i2c_runtime_suspend(struct device *dev) { int ret = 0; struct geni_i2c_dev *gi2c = dev_get_drvdata(dev); @@ -1230,7 +1230,7 @@ static int __maybe_unused geni_i2c_runtime_suspend(struct device *dev) return 0; } -static int __maybe_unused geni_i2c_runtime_resume(struct device *dev) +static int geni_i2c_runtime_resume(struct device *dev) { int ret = 0; struct geni_i2c_dev *gi2c = dev_get_drvdata(dev); @@ -1246,7 +1246,7 @@ static int __maybe_unused geni_i2c_runtime_resume(struct device *dev) return 0; } -static int __maybe_unused geni_i2c_suspend_noirq(struct device *dev) +static int geni_i2c_suspend_noirq(struct device *dev) { struct geni_i2c_dev *gi2c = dev_get_drvdata(dev); int ret; @@ -1260,7 +1260,7 @@ static int __maybe_unused geni_i2c_suspend_noirq(struct device *dev) return ret; } -static int __maybe_unused geni_i2c_resume_noirq(struct device *dev) +static int geni_i2c_resume_noirq(struct device *dev) { struct geni_i2c_dev *gi2c = dev_get_drvdata(dev); int ret; @@ -1274,9 +1274,10 @@ static int __maybe_unused geni_i2c_resume_noirq(struct device *dev) } static const struct dev_pm_ops geni_i2c_pm_ops = { - SET_NOIRQ_SYSTEM_SLEEP_PM_OPS(geni_i2c_suspend_noirq, geni_i2c_resume_noirq) - SET_RUNTIME_PM_OPS(geni_i2c_runtime_suspend, geni_i2c_runtime_resume, - NULL) + NOIRQ_SYSTEM_SLEEP_PM_OPS(geni_i2c_suspend_noirq, + geni_i2c_resume_noirq) + RUNTIME_PM_OPS(geni_i2c_runtime_suspend, geni_i2c_runtime_resume, + NULL) }; static const struct geni_i2c_desc geni_i2c = { |