Merge tag 'for-linus-5.12-1' of git://github.com/cminyard/linux-ipmi

[linux-2.6-microblaze.git] / drivers / dma / pl330.c

diff --git a/drivers/dma/pl330.c b/drivers/dma/pl330.c
index bc0f66a..fd8d2bc 100644 (file)
--- a/drivers/dma/pl330.c
+++ b/drivers/dma/pl330.c
@@ -3195,7 +3195,7 @@ probe_err2:
        return ret;
 }
 
-static int pl330_remove(struct amba_device *adev)
+static void pl330_remove(struct amba_device *adev)
 {
        struct pl330_dmac *pl330 = amba_get_drvdata(adev);
        struct dma_pl330_chan *pch, *_p;
@@ -3235,7 +3235,6 @@ static int pl330_remove(struct amba_device *adev)
 
        if (pl330->rstc)
                reset_control_assert(pl330->rstc);
-       return 0;
 }
 
 static const struct amba_id pl330_ids[] = {