diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-08-07 12:58:11 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-08-07 12:58:11 -0700 |
| commit | 75dee3b6de4ce31464ffb827b81ddb5414599159 (patch) | |
| tree | eba91122c54a50c87f19c2fea3cff5b290776064 /drivers/mailbox/imx-mailbox.c | |
| parent | ce615f5c1f73537c8267035d58b3d0c70e19b8da (diff) | |
| parent | 884996986347dbe3b735cfa9bc041dd98a533796 (diff) | |
| download | linux-75dee3b6de4ce31464ffb827b81ddb5414599159.tar.bz2 | |
Merge tag 'mailbox-v5.9' of git://git.linaro.org/landing-teams/working/fujitsu/integration
Pull mailbox updates from Jassi Brar:
"mediatek:
- add support for mt6779 gce
- shutdown cleanup and address shift support
qcom:
- add msm8994 apcs and sdm660 hmss compatibility
imx:
- mark PM funcs __maybe
pcc:
- put acpi table before bailout
misc:
- replace http with https links"
* tag 'mailbox-v5.9' of git://git.linaro.org/landing-teams/working/fujitsu/integration:
mailbox: mediatek: cmdq: clear task in channel before shutdown
mailbox: cmdq: support mt6779 gce platform definition
mailbox: cmdq: variablize address shift in platform
dt-binding: gce: add gce header file for mt6779
mailbox: qcom: Add msm8994 apcs compatible
mailbox: qcom: Add sdm660 hmss compatible
mailbox: imx: Mark PM functions as __maybe_unused
mailbox: pcc: Put the PCCT table for error path
mailbox: Replace HTTP links with HTTPS ones
Diffstat (limited to 'drivers/mailbox/imx-mailbox.c')
| -rw-r--r-- | drivers/mailbox/imx-mailbox.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/mailbox/imx-mailbox.c b/drivers/mailbox/imx-mailbox.c index 7205b825c8b5..2543c7b6948b 100644 --- a/drivers/mailbox/imx-mailbox.c +++ b/drivers/mailbox/imx-mailbox.c @@ -598,7 +598,7 @@ static const struct of_device_id imx_mu_dt_ids[] = { }; MODULE_DEVICE_TABLE(of, imx_mu_dt_ids); -static int imx_mu_suspend_noirq(struct device *dev) +static int __maybe_unused imx_mu_suspend_noirq(struct device *dev) { struct imx_mu_priv *priv = dev_get_drvdata(dev); @@ -608,7 +608,7 @@ static int imx_mu_suspend_noirq(struct device *dev) return 0; } -static int imx_mu_resume_noirq(struct device *dev) +static int __maybe_unused imx_mu_resume_noirq(struct device *dev) { struct imx_mu_priv *priv = dev_get_drvdata(dev); @@ -626,7 +626,7 @@ static int imx_mu_resume_noirq(struct device *dev) return 0; } -static int imx_mu_runtime_suspend(struct device *dev) +static int __maybe_unused imx_mu_runtime_suspend(struct device *dev) { struct imx_mu_priv *priv = dev_get_drvdata(dev); @@ -635,7 +635,7 @@ static int imx_mu_runtime_suspend(struct device *dev) return 0; } -static int imx_mu_runtime_resume(struct device *dev) +static int __maybe_unused imx_mu_runtime_resume(struct device *dev) { struct imx_mu_priv *priv = dev_get_drvdata(dev); int ret; |