summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Reding <treding@nvidia.com>2013-09-25 18:33:31 +0200
committerThierry Reding <treding@nvidia.com>2013-10-31 09:20:07 +0100
commit452e7f0cdaf229dc9da36e7a3d36d88a4d51fb56 (patch)
treea3c076ad85ef85ddbd2dd011415ad07eab70a981
parent9eb9b220fc7deec9022d2340346f12554a3c7f1c (diff)
downloadblackbird-op-linux-452e7f0cdaf229dc9da36e7a3d36d88a4d51fb56.tar.gz
blackbird-op-linux-452e7f0cdaf229dc9da36e7a3d36d88a4d51fb56.zip
gpu: host1x: Do not discard .remove()
The device can be unbound from the driver via sysfs, so regardless of whether the driver is builtin or a module, its .remove() function needs to stick around. Signed-off-by: Thierry Reding <treding@nvidia.com>
-rw-r--r--drivers/gpu/host1x/dev.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/gpu/host1x/dev.c b/drivers/gpu/host1x/dev.c
index 0f7b44c55ec7..105aa4ed665a 100644
--- a/drivers/gpu/host1x/dev.c
+++ b/drivers/gpu/host1x/dev.c
@@ -172,7 +172,7 @@ fail_deinit_syncpt:
return err;
}
-static int __exit host1x_remove(struct platform_device *pdev)
+static int host1x_remove(struct platform_device *pdev)
{
struct host1x *host = platform_get_drvdata(pdev);
@@ -184,13 +184,12 @@ static int __exit host1x_remove(struct platform_device *pdev)
}
static struct platform_driver tegra_host1x_driver = {
- .probe = host1x_probe,
- .remove = __exit_p(host1x_remove),
.driver = {
- .owner = THIS_MODULE,
.name = "tegra-host1x",
.of_match_table = host1x_of_match,
},
+ .probe = host1x_probe,
+ .remove = host1x_remove,
};
static int __init tegra_host1x_init(void)
OpenPOWER on IntegriCloud