Browse Source

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>
Michal Simek 11 years ago
parent
commit
de77d1e5b4
1 changed files with 0 additions and 6 deletions
  1. 0 6
      arch/arm/kernel/etm.c

+ 0 - 6
arch/arm/kernel/etm.c

@@ -385,7 +385,6 @@ out:
 	return ret;
 	return ret;
 
 
 out_unmap:
 out_unmap:
-	amba_set_drvdata(dev, NULL);
 	iounmap(t->etb_regs);
 	iounmap(t->etb_regs);
 
 
 out_release:
 out_release:
@@ -398,8 +397,6 @@ static int etb_remove(struct amba_device *dev)
 {
 {
 	struct tracectx *t = amba_get_drvdata(dev);
 	struct tracectx *t = amba_get_drvdata(dev);
 
 
-	amba_set_drvdata(dev, NULL);
-
 	iounmap(t->etb_regs);
 	iounmap(t->etb_regs);
 	t->etb_regs = NULL;
 	t->etb_regs = NULL;
 
 
@@ -588,7 +585,6 @@ out:
 	return ret;
 	return ret;
 
 
 out_unmap:
 out_unmap:
-	amba_set_drvdata(dev, NULL);
 	iounmap(t->etm_regs);
 	iounmap(t->etm_regs);
 
 
 out_release:
 out_release:
@@ -601,8 +597,6 @@ static int etm_remove(struct amba_device *dev)
 {
 {
 	struct tracectx *t = amba_get_drvdata(dev);
 	struct tracectx *t = amba_get_drvdata(dev);
 
 
-	amba_set_drvdata(dev, NULL);
-
 	iounmap(t->etm_regs);
 	iounmap(t->etm_regs);
 	t->etm_regs = NULL;
 	t->etm_regs = NULL;