diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2024-01-17 15:39:32 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2024-01-17 15:39:32 -0800 |
| commit | 75afd029e607623df50495ec6acefe82138d6935 (patch) | |
| tree | bda8dc00db886f3cf57ddf9f247c23f297e2c791 /drivers/mailbox/qcom-ipcc.c | |
| parent | 08df80a3c51674ab73ae770885a383ca553fbbbf (diff) | |
| parent | cd795fb0c352c1f70e5fa437b01572c8693e1b77 (diff) | |
| download | linux-75afd029e607623df50495ec6acefe82138d6935.tar.gz linux-75afd029e607623df50495ec6acefe82138d6935.tar.bz2 linux-75afd029e607623df50495ec6acefe82138d6935.zip | |
Merge tag 'mailbox-v6.8' of git://git.kernel.org/pub/scm/linux/kernel/git/jassibrar/mailbox
Pull mailbox updates from Jassi Brar:
- add CMDQ support for mediatek mt8188
- mhuv2: fix channel window status
- qcom: document X1E80100 IPC controller and misc cleanup
- add Versal bindings to xlnx
- Convert to platform remove callback returning void
* tag 'mailbox-v6.8' of git://git.kernel.org/pub/scm/linux/kernel/git/jassibrar/mailbox: (23 commits)
mailbox: mtk-cmdq: Add CMDQ driver support for mt8188
mailbox: mtk-cmdq: Sort cmdq platform data by compatible name
mailbox: mtk-cmdq: Rename gce_plat variable with SoC name postfix
dt-bindings: mailbox: qcom-ipcc: document the X1E80100 Inter-Processor Communication Controller
mailbox: zynqmp-ipi: Convert to platform remove callback returning void
mailbox: tegra-hsp: Convert to platform remove callback returning void
mailbox: sun6i-msgbox: Convert to platform remove callback returning void
mailbox: stm32-ipcc: Convert to platform remove callback returning void
mailbox: qcom-ipcc: Convert to platform remove callback returning void
mailbox: qcom-apcs-ipc: Convert to platform remove callback returning void
mailbox: omap: Convert to platform remove callback returning void
mailbox: mtk-cmdq: Convert to platform remove callback returning void
mailbox: mailbox-test: Convert to platform remove callback returning void
mailbox: imx: Convert to platform remove callback returning void
mailbox: bcm-pdc: Convert to platform remove callback returning void
mailbox: bcm-flexrm: Convert to platform remove callback returning void
mailbox: zynqmp-ipi: fix an Excess struct member kernel-doc warning
dt-bindings: mailbox: add Versal IPI bindings
dt-bindings: mailbox: zynqmp: extend required list
mailbox: arm_mhuv2: Fix a bug for mhuv2_sender_interrupt
...
Diffstat (limited to 'drivers/mailbox/qcom-ipcc.c')
| -rw-r--r-- | drivers/mailbox/qcom-ipcc.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/mailbox/qcom-ipcc.c b/drivers/mailbox/qcom-ipcc.c index f597a1bd5684..d537cc9c4d4b 100644 --- a/drivers/mailbox/qcom-ipcc.c +++ b/drivers/mailbox/qcom-ipcc.c @@ -326,14 +326,12 @@ err_mbox: return ret; } -static int qcom_ipcc_remove(struct platform_device *pdev) +static void qcom_ipcc_remove(struct platform_device *pdev) { struct qcom_ipcc *ipcc = platform_get_drvdata(pdev); disable_irq_wake(ipcc->irq); irq_domain_remove(ipcc->irq_domain); - - return 0; } static const struct of_device_id qcom_ipcc_of_match[] = { @@ -348,7 +346,7 @@ static const struct dev_pm_ops qcom_ipcc_dev_pm_ops = { static struct platform_driver qcom_ipcc_driver = { .probe = qcom_ipcc_probe, - .remove = qcom_ipcc_remove, + .remove_new = qcom_ipcc_remove, .driver = { .name = "qcom-ipcc", .of_match_table = qcom_ipcc_of_match, |