Commit de77d1e5 authored by Michal Simek's avatar Michal Simek Committed by Russell King

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: 0998d063)
Signed-off-by: default avatarMichal Simek <michal.simek@xilinx.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 90a84712
...@@ -385,7 +385,6 @@ static int etb_probe(struct amba_device *dev, const struct amba_id *id) ...@@ -385,7 +385,6 @@ static int etb_probe(struct amba_device *dev, const struct amba_id *id)
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) ...@@ -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 @@ static int etm_probe(struct amba_device *dev, const struct amba_id *id) ...@@ -588,7 +585,6 @@ static int etm_probe(struct amba_device *dev, const struct amba_id *id)
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) ...@@ -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;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment