From: Greg Kroah-Hartman Date: Fri, 5 Feb 2021 10:15:43 +0000 (+0100) Subject: Merge branch 'devel-stable' of git://git.armlinux.org.uk/~rmk/linux-arm into char... X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=0573d3fa48640f0fa6b105ff92dcb02b94d6c1ab;p=linux.git Merge branch 'devel-stable' of git://git.armlinux.org.uk/~rmk/linux-arm into char-misc-next This merges from linux-arm at 860660fd829e ("ARM: 9055/1: mailbox: arm_mhuv2: make remove callback return void") into char-misc-next to get the amba fixes from Uwe. Cc: Uwe Kleine-König Cc: Russell King Signed-off-by: Greg Kroah-Hartman --- 0573d3fa48640f0fa6b105ff92dcb02b94d6c1ab diff --cc drivers/hwtracing/coresight/coresight-etm4x-core.c index 5017d33ba4f5c,82787cba537d3..bc55b261af233 --- a/drivers/hwtracing/coresight/coresight-etm4x-core.c +++ b/drivers/hwtracing/coresight/coresight-etm4x-core.c @@@ -1906,30 -1703,8 +1906,28 @@@ static int __exit etm4_remove_dev(struc cpus_read_unlock(); coresight_unregister(drvdata->csdev); - - return 0; } +static int __exit etm4_remove_amba(struct amba_device *adev) +{ + struct etmv4_drvdata *drvdata = dev_get_drvdata(&adev->dev); + + if (drvdata) + return etm4_remove_dev(drvdata); + return 0; +} + +static int __exit etm4_remove_platform_dev(struct platform_device *pdev) +{ + int ret = 0; + struct etmv4_drvdata *drvdata = dev_get_drvdata(&pdev->dev); + + if (drvdata) + ret = etm4_remove_dev(drvdata); + pm_runtime_disable(&pdev->dev); + return ret; +} + static const struct amba_id etm4_ids[] = { CS_AMBA_ID(0x000bb95d), /* Cortex-A53 */ CS_AMBA_ID(0x000bb95e), /* Cortex-A57 */