diff options
author | Michal Simek <michal.simek@xilinx.com> | 2013-11-26 05:38:19 -0500 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2013-12-29 07:32:34 -0500 |
commit | de77d1e5b412b31aa2f382bc6fe048d84e28d48e (patch) | |
tree | d7fab75c4fb970c510ee81efda237d2d7ea99a30 /arch/arm/kernel/etm.c | |
parent | 90a8471232797b96ed9af3a31fbb21b2df245ed1 (diff) |
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>
Diffstat (limited to 'arch/arm/kernel/etm.c')
-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: | |||
385 | return ret; | 385 | return ret; |
386 | 386 | ||
387 | out_unmap: | 387 | out_unmap: |
388 | amba_set_drvdata(dev, NULL); | ||
389 | iounmap(t->etb_regs); | 388 | iounmap(t->etb_regs); |
390 | 389 | ||
391 | out_release: | 390 | out_release: |
@@ -398,8 +397,6 @@ static int etb_remove(struct amba_device *dev) | |||
398 | { | 397 | { |
399 | struct tracectx *t = amba_get_drvdata(dev); | 398 | struct tracectx *t = amba_get_drvdata(dev); |
400 | 399 | ||
401 | amba_set_drvdata(dev, NULL); | ||
402 | |||
403 | iounmap(t->etb_regs); | 400 | iounmap(t->etb_regs); |
404 | t->etb_regs = NULL; | 401 | t->etb_regs = NULL; |
405 | 402 | ||
@@ -588,7 +585,6 @@ out: | |||
588 | return ret; | 585 | return ret; |
589 | 586 | ||
590 | out_unmap: | 587 | out_unmap: |
591 | amba_set_drvdata(dev, NULL); | ||
592 | iounmap(t->etm_regs); | 588 | iounmap(t->etm_regs); |
593 | 589 | ||
594 | out_release: | 590 | out_release: |
@@ -601,8 +597,6 @@ static int etm_remove(struct amba_device *dev) | |||
601 | { | 597 | { |
602 | struct tracectx *t = amba_get_drvdata(dev); | 598 | struct tracectx *t = amba_get_drvdata(dev); |
603 | 599 | ||
604 | amba_set_drvdata(dev, NULL); | ||
605 | |||
606 | iounmap(t->etm_regs); | 600 | iounmap(t->etm_regs); |
607 | t->etm_regs = NULL; | 601 | t->etm_regs = NULL; |
608 | 602 | ||