[backfire] backport r26906
[openwrt/svn-archive/archive.git] / target / linux / generic-2.6 / patches-2.6.32 / 920-01-hotpluggable-spi-gpio.patch
1 Fix spi-gpio for hotplug.
2
3 --mb
4
5
6
7 --- a/drivers/spi/spi_gpio.c
8 +++ b/drivers/spi/spi_gpio.c
9 @@ -218,7 +218,7 @@ static void spi_gpio_cleanup(struct spi_
10 spi_bitbang_cleanup(spi);
11 }
12
13 -static int __init spi_gpio_alloc(unsigned pin, const char *label, bool is_in)
14 +static int __devinit spi_gpio_alloc(unsigned pin, const char *label, bool is_in)
15 {
16 int value;
17
18 @@ -232,7 +232,7 @@ static int __init spi_gpio_alloc(unsigne
19 return value;
20 }
21
22 -static int __init
23 +static int __devinit
24 spi_gpio_request(struct spi_gpio_platform_data *pdata, const char *label)
25 {
26 int value;
27 @@ -261,7 +261,7 @@ done:
28 return value;
29 }
30
31 -static int __init spi_gpio_probe(struct platform_device *pdev)
32 +static int __devinit spi_gpio_probe(struct platform_device *pdev)
33 {
34 int status;
35 struct spi_master *master;
36 @@ -317,7 +317,7 @@ gpio_free:
37 return status;
38 }
39
40 -static int __exit spi_gpio_remove(struct platform_device *pdev)
41 +static int __devexit spi_gpio_remove(struct platform_device *pdev)
42 {
43 struct spi_gpio *spi_gpio;
44 struct spi_gpio_platform_data *pdata;
45 @@ -344,12 +344,13 @@ MODULE_ALIAS("platform:" DRIVER_NAME);
46 static struct platform_driver spi_gpio_driver = {
47 .driver.name = DRIVER_NAME,
48 .driver.owner = THIS_MODULE,
49 - .remove = __exit_p(spi_gpio_remove),
50 + .probe = spi_gpio_probe,
51 + .remove = __devexit_p(spi_gpio_remove),
52 };
53
54 static int __init spi_gpio_init(void)
55 {
56 - return platform_driver_probe(&spi_gpio_driver, spi_gpio_probe);
57 + return platform_driver_register(&spi_gpio_driver);
58 }
59 module_init(spi_gpio_init);
60