Commit 596f1034 authored by Al Viro's avatar Al Viro Committed by Linus Torvalds

fix talitos

talitos_remove() can be called from talitos_probe() on failure
exit path, so it can't be __devexit.
Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 6005e3eb
...@@ -1357,7 +1357,7 @@ static int hw_supports(struct device *dev, __be32 desc_hdr_template) ...@@ -1357,7 +1357,7 @@ static int hw_supports(struct device *dev, __be32 desc_hdr_template)
return ret; return ret;
} }
static int __devexit talitos_remove(struct of_device *ofdev) static int talitos_remove(struct of_device *ofdev)
{ {
struct device *dev = &ofdev->dev; struct device *dev = &ofdev->dev;
struct talitos_private *priv = dev_get_drvdata(dev); struct talitos_private *priv = dev_get_drvdata(dev);
...@@ -1622,7 +1622,7 @@ static struct of_platform_driver talitos_driver = { ...@@ -1622,7 +1622,7 @@ static struct of_platform_driver talitos_driver = {
.name = "talitos", .name = "talitos",
.match_table = talitos_match, .match_table = talitos_match,
.probe = talitos_probe, .probe = talitos_probe,
.remove = __devexit_p(talitos_remove), .remove = talitos_remove,
}; };
static int __init talitos_init(void) static int __init talitos_init(void)
......
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