projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Input: remove use of __devexit
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
input
/
joystick
/
maplecontrol.c
diff --git
a/drivers/input/joystick/maplecontrol.c
b/drivers/input/joystick/maplecontrol.c
index 77cfde571bd92b52835399294c8dd6c849e11f3a..59c10ec5a2a13310ef667c96d9cb8675f739368c 100644
(file)
--- a/
drivers/input/joystick/maplecontrol.c
+++ b/
drivers/input/joystick/maplecontrol.c
@@
-78,7
+78,7
@@
static void dc_pad_close(struct input_dev *dev)
}
/* allow the controller to be used */
}
/* allow the controller to be used */
-static int
__devinit
probe_maple_controller(struct device *dev)
+static int probe_maple_controller(struct device *dev)
{
static const short btn_bit[32] = {
BTN_C, BTN_B, BTN_A, BTN_START, -1, -1, -1, -1,
{
static const short btn_bit[32] = {
BTN_C, BTN_B, BTN_A, BTN_START, -1, -1, -1, -1,
@@
-157,7
+157,7
@@
fail:
return error;
}
return error;
}
-static int
__devexit
remove_maple_controller(struct device *dev)
+static int remove_maple_controller(struct device *dev)
{
struct maple_device *mdev = to_maple_dev(dev);
struct dc_pad *pad = maple_get_drvdata(mdev);
{
struct maple_device *mdev = to_maple_dev(dev);
struct dc_pad *pad = maple_get_drvdata(mdev);
@@
-175,7
+175,7
@@
static struct maple_driver dc_pad_driver = {
.drv = {
.name = "Dreamcast_controller",
.probe = probe_maple_controller,
.drv = {
.name = "Dreamcast_controller",
.probe = probe_maple_controller,
- .remove =
__devexit_p(remove_maple_controller)
,
+ .remove =
remove_maple_controller
,
},
};
},
};