diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-02-05 11:15:43 +0100 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-02-05 11:15:43 +0100 |
commit | 0573d3fa48640f0fa6b105ff92dcb02b94d6c1ab (patch) | |
tree | 9ec7ef79856a7aff2d4230adcaa9073d20919afb /drivers/hwtracing/coresight/coresight-funnel.c | |
parent | Merge tag 'icc-5.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/djakov/icc into char-misc-next (diff) | |
parent | ARM: 9055/1: mailbox: arm_mhuv2: make remove callback return void (diff) | |
download | linux-dev-0573d3fa48640f0fa6b105ff92dcb02b94d6c1ab.tar.xz linux-dev-0573d3fa48640f0fa6b105ff92dcb02b94d6c1ab.zip |
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 <u.kleine-koenig@pengutronix.de>
Cc: Russell King <linux@armlinux.org.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/hwtracing/coresight/coresight-funnel.c')
-rw-r--r-- | drivers/hwtracing/coresight/coresight-funnel.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/hwtracing/coresight/coresight-funnel.c b/drivers/hwtracing/coresight/coresight-funnel.c index 38bebdddcbff..b363dd6bc510 100644 --- a/drivers/hwtracing/coresight/coresight-funnel.c +++ b/drivers/hwtracing/coresight/coresight-funnel.c @@ -373,9 +373,9 @@ static int dynamic_funnel_probe(struct amba_device *adev, return funnel_probe(&adev->dev, &adev->res); } -static int dynamic_funnel_remove(struct amba_device *adev) +static void dynamic_funnel_remove(struct amba_device *adev) { - return funnel_remove(&adev->dev); + funnel_remove(&adev->dev); } static const struct amba_id dynamic_funnel_ids[] = { |