From 3272ed135e01b23438089859dad6b1ccc71f3f98 Mon Sep 17 00:00:00 2001 From: Johan Hovold Date: Fri, 8 Mar 2013 11:07:59 +0100 Subject: [PATCH] --- yaml --- r: 361341 b: refs/heads/master c: 01230551e7c2fb9a1c2519b356d703851049cbe0 h: refs/heads/master i: 361339: 1e21ce9d5ac9ad7799279d4305b6b859b64951ae v: v3 --- [refs] | 2 +- trunk/drivers/w1/masters/w1-gpio.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index edb64247f60e..f37d755d5155 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2d798a3f20ae992b0b69a2b68c04ada397c32ed4 +refs/heads/master: 01230551e7c2fb9a1c2519b356d703851049cbe0 diff --git a/trunk/drivers/w1/masters/w1-gpio.c b/trunk/drivers/w1/masters/w1-gpio.c index d39dfa4cc235..012817abb12f 100644 --- a/trunk/drivers/w1/masters/w1-gpio.c +++ b/trunk/drivers/w1/masters/w1-gpio.c @@ -158,7 +158,7 @@ static int w1_gpio_probe(struct platform_device *pdev) return err; } -static int __exit w1_gpio_remove(struct platform_device *pdev) +static int w1_gpio_remove(struct platform_device *pdev) { struct w1_bus_master *master = platform_get_drvdata(pdev); struct w1_gpio_platform_data *pdata = pdev->dev.platform_data; @@ -210,7 +210,7 @@ static struct platform_driver w1_gpio_driver = { .of_match_table = of_match_ptr(w1_gpio_dt_ids), }, .probe = w1_gpio_probe, - .remove = __exit_p(w1_gpio_remove), + .remove = w1_gpio_remove, .suspend = w1_gpio_suspend, .resume = w1_gpio_resume, };