summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--drivers/sbus/char/flash.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/sbus/char/flash.c b/drivers/sbus/char/flash.c
index ea2d903ba673..05d37d31c3b8 100644
--- a/drivers/sbus/char/flash.c
+++ b/drivers/sbus/char/flash.c
@@ -187,11 +187,9 @@ static int flash_probe(struct platform_device *op)
return misc_register(&flash_dev);
}
-static int flash_remove(struct platform_device *op)
+static void flash_remove(struct platform_device *op)
{
misc_deregister(&flash_dev);
-
- return 0;
}
static const struct of_device_id flash_match[] = {
@@ -208,7 +206,7 @@ static struct platform_driver flash_driver = {
.of_match_table = flash_match,
},
.probe = flash_probe,
- .remove = flash_remove,
+ .remove_new = flash_remove,
};
module_platform_driver(flash_driver);