Commit 67a52bb9 authored by Russell King's avatar Russell King Committed by Russell King

[ARM] fix build-breaking 7a192ec3 commit

The commit:

    platform driver: fix incorrect use of 'platform_bus_type' with 'struct device_driver'

contains this:

-static int __exit pxa2xx_flash_remove(struct device *dev)
+static int __exit pxa2xx_flash_remove(struct platform_device *dev)
...
-       .remove         = __exit_p(pxa2xx_flash_remove),
+       .remove         = __devexit_p(pxa2xx_flash_remove),

which leads to the following build error:

`pxa2xx_flash_remove' referenced in section `.data' of drivers/built-in.o: defined in discarded section `.exit.text' of drivers/built-in.o

This is not the only instance of it in this patch - all __exit_p's
touched by this patch have been converted to __devexit_p's without
regard to the original function.

Let's revert this change and, if we are going to convert functions
to be __devexit/__devinit, lets have that as a _separate_ patch doing
just that change.
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent cd02938a
...@@ -117,7 +117,7 @@ static int __init pxa2xx_flash_probe(struct platform_device *pdev) ...@@ -117,7 +117,7 @@ static int __init pxa2xx_flash_probe(struct platform_device *pdev)
return 0; return 0;
} }
static int __exit pxa2xx_flash_remove(struct platform_device *dev) static int __devexit pxa2xx_flash_remove(struct platform_device *dev)
{ {
struct pxa2xx_flash_info *info = platform_get_drvdata(dev); struct pxa2xx_flash_info *info = platform_get_drvdata(dev);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment