From da2382218c37fe7f8186c20b6b18aba477ec9b19 Mon Sep 17 00:00:00 2001 From: Ricardo Ribalda Delgado Date: Sun, 18 Jan 2015 12:39:30 +0100 Subject: [PATCH] gpio: gpio-mm-lantiq: Use of_mm_gpiochip_remove Since d621e8bae5ac9c67 (Create of_mm_gpiochip_remove), there is a counterpart for of_mm_gpiochip_add. This patch implements the remove function of the driver making use of it. Cc: Alexandre Courbot Cc: John Crispin Signed-off-by: Ricardo Ribalda Delgado Signed-off-by: Linus Walleij --- drivers/gpio/gpio-mm-lantiq.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/drivers/gpio/gpio-mm-lantiq.c b/drivers/gpio/gpio-mm-lantiq.c index 95ff180d261e..f67ef2283d64 100644 --- a/drivers/gpio/gpio-mm-lantiq.c +++ b/drivers/gpio/gpio-mm-lantiq.c @@ -111,6 +111,8 @@ static int ltq_mm_probe(struct platform_device *pdev) if (!chip) return -ENOMEM; + platform_set_drvdata(pdev, chip); + chip->mmchip.gc.ngpio = 16; chip->mmchip.gc.direction_output = ltq_mm_dir_out; chip->mmchip.gc.set = ltq_mm_set; @@ -123,6 +125,15 @@ static int ltq_mm_probe(struct platform_device *pdev) return of_mm_gpiochip_add(pdev->dev.of_node, &chip->mmchip); } +static int ltq_mm_remove(struct platform_device *pdev) +{ + struct ltq_mm *chip = platform_get_drvdata(pdev); + + of_mm_gpiochip_remove(&chip->mmchip); + + return 0; +} + static const struct of_device_id ltq_mm_match[] = { { .compatible = "lantiq,gpio-mm" }, {}, @@ -131,6 +142,7 @@ MODULE_DEVICE_TABLE(of, ltq_mm_match); static struct platform_driver ltq_mm_driver = { .probe = ltq_mm_probe, + .remove = ltq_mm_remove, .driver = { .name = "gpio-mm-ltq", .of_match_table = ltq_mm_match, @@ -143,3 +155,9 @@ static int __init ltq_mm_init(void) } subsys_initcall(ltq_mm_init); + +static void __exit ltq_mm_exit(void) +{ + platform_driver_unregister(<q_mm_driver); +} +module_exit(ltq_mm_exit); -- 2.34.1