diff options
| author | Michal Simek <michal.simek@xilinx.com> | 2013-11-26 11:38:19 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2013-12-29 13:32:34 +0100 |
| commit | de77d1e5b412b31aa2f382bc6fe048d84e28d48e (patch) | |
| tree | d7fab75c4fb970c510ee81efda237d2d7ea99a30 | |
| parent | ARM: 7904/1: input: ambakmi: Remove unnecessary amba_set_drvdata() (diff) | |
| download | linux-de77d1e5b412b31aa2f382bc6fe048d84e28d48e.tar.xz linux-de77d1e5b412b31aa2f382bc6fe048d84e28d48e.zip | |
ARM: 7905/1: etm: 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 <michal.simek@xilinx.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| -rw-r--r-- | arch/arm/kernel/etm.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/arch/arm/kernel/etm.c b/arch/arm/kernel/etm.c index 8ff0ecdc637f..131a6ab5f355 100644 --- a/arch/arm/kernel/etm.c +++ b/arch/arm/kernel/etm.c @@ -385,7 +385,6 @@ out: return ret; out_unmap: - amba_set_drvdata(dev, NULL); iounmap(t->etb_regs); out_release: @@ -398,8 +397,6 @@ static int etb_remove(struct amba_device *dev) { struct tracectx *t = amba_get_drvdata(dev); - amba_set_drvdata(dev, NULL); - iounmap(t->etb_regs); t->etb_regs = NULL; @@ -588,7 +585,6 @@ out: return ret; out_unmap: - amba_set_drvdata(dev, NULL); iounmap(t->etm_regs); out_release: @@ -601,8 +597,6 @@ static int etm_remove(struct amba_device *dev) { struct tracectx *t = amba_get_drvdata(dev); - amba_set_drvdata(dev, NULL); - iounmap(t->etm_regs); t->etm_regs = NULL; |