releases/3.8.4/w1-gpio-remove-erroneous-__exit-and-__exit_p.patch

   1 From 01230551e7c2fb9a1c2519b356d703851049cbe0 Mon Sep 17 00:00:00 2001
   2 From: Johan Hovold <jhovold@gmail.com>
   3 Date: Fri, 8 Mar 2013 11:07:59 +0100
   4 Subject: w1-gpio: remove erroneous __exit and __exit_p()
   5
   6 From: Johan Hovold <jhovold@gmail.com>
   7
   8 commit 01230551e7c2fb9a1c2519b356d703851049cbe0 upstream.
   9
  10 Commit 8a1861d997 ("w1-gpio: Simplify & get rid of defines") changed
  11 (apparently unknowingly) the driver to a hotpluggable platform-device
  12 driver but did not not update the section markers for probe and remove
  13 (to __devinit/exit, which have since been removed). A later commit fixed
  14 the section mismatch for probe, but left remove marked with __exit.
  15
  16 Signed-off-by: Johan Hovold <jhovold@gmail.com>
  17 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  18
  19 ---
  20  drivers/w1/masters/w1-gpio.c |    4 ++--
  21  1 file changed, 2 insertions(+), 2 deletions(-)
  22
  23 --- a/drivers/w1/masters/w1-gpio.c
  24 +++ b/drivers/w1/masters/w1-gpio.c
  25 @@ -158,7 +158,7 @@ static int w1_gpio_probe(struct platform
  26         return err;
  27  }
  28
  29 -static int __exit w1_gpio_remove(struct platform_device *pdev)
  30 +static int w1_gpio_remove(struct platform_device *pdev)
  31  {
  32         struct w1_bus_master *master = platform_get_drvdata(pdev);
  33         struct w1_gpio_platform_data *pdata = pdev->dev.platform_data;
  34 @@ -210,7 +210,7 @@ static struct platform_driver w1_gpio_dr
  35                 .of_match_table = of_match_ptr(w1_gpio_dt_ids),
  36         },
  37         .probe = w1_gpio_probe,
  38 -       .remove = __exit_p(w1_gpio_remove),
  39 +       .remove = w1_gpio_remove,
  40         .suspend = w1_gpio_suspend,
  41         .resume = w1_gpio_resume,
  42  };