diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-02-05 13:15:43 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-02-05 13:15:43 +0300 |
| commit | 0573d3fa48640f0fa6b105ff92dcb02b94d6c1ab (patch) | |
| tree | 9ec7ef79856a7aff2d4230adcaa9073d20919afb /drivers/hwtracing/coresight/coresight-cti-core.c | |
| parent | 51571108888a9ff666859682784366e597ce84da (diff) | |
| parent | 860660fd829e64d4deb255fac9d73ab84a1440c3 (diff) | |
| download | linux-0573d3fa48640f0fa6b105ff92dcb02b94d6c1ab.tar.xz | |
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-cti-core.c')
| -rw-r--r-- | drivers/hwtracing/coresight/coresight-cti-core.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/hwtracing/coresight/coresight-cti-core.c b/drivers/hwtracing/coresight/coresight-cti-core.c index 0c81eb9603ae..e2a3620cbf48 100644 --- a/drivers/hwtracing/coresight/coresight-cti-core.c +++ b/drivers/hwtracing/coresight/coresight-cti-core.c @@ -839,7 +839,7 @@ static void cti_device_release(struct device *dev) if (drvdata->csdev_release) drvdata->csdev_release(dev); } -static int cti_remove(struct amba_device *adev) +static void cti_remove(struct amba_device *adev) { struct cti_drvdata *drvdata = dev_get_drvdata(&adev->dev); @@ -848,8 +848,6 @@ static int cti_remove(struct amba_device *adev) mutex_unlock(&ect_mutex); coresight_unregister(drvdata->csdev); - - return 0; } static int cti_probe(struct amba_device *adev, const struct amba_id *id) |