From: Michal Simek Date: Thu, 3 Oct 2013 09:46:23 +0000 (+0200) Subject: dma: pl330: Remove unnecessary amba_set_drvdata() X-Git-Tag: firefly_0821_release~176^2~4916^2~20^2 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=600d525869c45a6b3ce1fa5e58281376c5a2dab2;p=firefly-linux-kernel-4.4.55.git dma: pl330: Remove unnecessary amba_set_drvdata() Driver core clears the driver data to NULL after device_release or on probe failure, so just remove it from here. Driver core change: "device-core: Ensure drvdata = NULL when no driver is bound" (sha1: 0998d0631001288a5974afc0b2a5f568bcdecb4d) Signed-off-by: Michal Simek Signed-off-by: Vinod Koul --- diff --git a/drivers/dma/pl330.c b/drivers/dma/pl330.c index 96de393aaf4f..75328f9870d2 100644 --- a/drivers/dma/pl330.c +++ b/drivers/dma/pl330.c @@ -3036,8 +3036,6 @@ pl330_probe(struct amba_device *adev, const struct amba_id *id) return 0; probe_err3: - amba_set_drvdata(adev, NULL); - /* Idle the DMAC */ list_for_each_entry_safe(pch, _p, &pdmac->ddma.channels, chan.device_node) { @@ -3068,7 +3066,6 @@ static int pl330_remove(struct amba_device *adev) of_dma_controller_free(adev->dev.of_node); dma_async_device_unregister(&pdmac->ddma); - amba_set_drvdata(adev, NULL); /* Idle the DMAC */ list_for_each_entry_safe(pch, _p, &pdmac->ddma.channels,