projects
/
platform
/
kernel
/
linux-rpi.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'mfd-3.8-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6
[platform/kernel/linux-rpi.git]
/
drivers
/
gpio
/
gpio-da9052.c
diff --git
a/drivers/gpio/gpio-da9052.c
b/drivers/gpio/gpio-da9052.c
index
63f9f5b
..
29b11e9
100644
(file)
--- a/
drivers/gpio/gpio-da9052.c
+++ b/
drivers/gpio/gpio-da9052.c
@@
-192,7
+192,7
@@
static int da9052_gpio_to_irq(struct gpio_chip *gc, u32 offset)
return irq;
}
return irq;
}
-static struct gpio_chip reference_gp
__devinitdata
= {
+static struct gpio_chip reference_gp = {
.label = "da9052-gpio",
.owner = THIS_MODULE,
.get = da9052_gpio_get,
.label = "da9052-gpio",
.owner = THIS_MODULE,
.get = da9052_gpio_get,
@@
-205,7
+205,7
@@
static struct gpio_chip reference_gp __devinitdata = {
.base = -1,
};
.base = -1,
};
-static int
__devinit
da9052_gpio_probe(struct platform_device *pdev)
+static int da9052_gpio_probe(struct platform_device *pdev)
{
struct da9052_gpio *gpio;
struct da9052_pdata *pdata;
{
struct da9052_gpio *gpio;
struct da9052_pdata *pdata;
@@
-233,7
+233,7
@@
static int __devinit da9052_gpio_probe(struct platform_device *pdev)
return 0;
}
return 0;
}
-static int
__devexit
da9052_gpio_remove(struct platform_device *pdev)
+static int da9052_gpio_remove(struct platform_device *pdev)
{
struct da9052_gpio *gpio = platform_get_drvdata(pdev);
{
struct da9052_gpio *gpio = platform_get_drvdata(pdev);
@@
-242,7
+242,7
@@
static int __devexit da9052_gpio_remove(struct platform_device *pdev)
static struct platform_driver da9052_gpio_driver = {
.probe = da9052_gpio_probe,
static struct platform_driver da9052_gpio_driver = {
.probe = da9052_gpio_probe,
- .remove =
__devexit_p(da9052_gpio_remove)
,
+ .remove =
da9052_gpio_remove
,
.driver = {
.name = "da9052-gpio",
.owner = THIS_MODULE,
.driver = {
.name = "da9052-gpio",
.owner = THIS_MODULE,