diff options
| author | Russell King <rmk+kernel@armlinux.org.uk> | 2021-02-22 13:09:55 +0000 |
|---|---|---|
| committer | Russell King <rmk+kernel@armlinux.org.uk> | 2021-02-22 13:09:55 +0000 |
| commit | 90e53c5e09251edb2cee367f6cb472e4bac121f2 (patch) | |
| tree | 797296eb8ef5de54a6ec919c0c1f7e1940262c4e /drivers/hwtracing/coresight/coresight-cpu-debug.c | |
| parent | fd749fe4bcb00ad80d9eece709f804bb4ac6bf1e (diff) | |
| parent | 860660fd829e64d4deb255fac9d73ab84a1440c3 (diff) | |
Merge branch 'devel-stable' into for-linus
Diffstat (limited to 'drivers/hwtracing/coresight/coresight-cpu-debug.c')
| -rw-r--r-- | drivers/hwtracing/coresight/coresight-cpu-debug.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/hwtracing/coresight/coresight-cpu-debug.c b/drivers/hwtracing/coresight/coresight-cpu-debug.c index e1d232411d8d..2dcf13de751f 100644 --- a/drivers/hwtracing/coresight/coresight-cpu-debug.c +++ b/drivers/hwtracing/coresight/coresight-cpu-debug.c @@ -627,7 +627,7 @@ err: return ret; } -static int debug_remove(struct amba_device *adev) +static void debug_remove(struct amba_device *adev) { struct device *dev = &adev->dev; struct debug_drvdata *drvdata = amba_get_drvdata(adev); @@ -642,8 +642,6 @@ static int debug_remove(struct amba_device *adev) if (!--debug_count) debug_func_exit(); - - return 0; } static const struct amba_cs_uci_id uci_id_debug[] = { |