Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 155091
b: refs/heads/master
c: eeafa5e
h: refs/heads/master
i:
  155089: efe5052
  155087: b9a6a95
v: v3
  • Loading branch information
Saeed Bishara authored and Dmitry Torokhov committed Jul 8, 2009
1 parent f9a5636 commit f3bc631
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 7 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: ddaa43433dd77535e4e132787f199f58ce224f44
refs/heads/master: eeafa5ef6de5acf678624a21f7dba7d43ba73845
11 changes: 5 additions & 6 deletions trunk/drivers/input/mouse/gpio_mouse.c
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ static void gpio_mouse_scan(struct input_polled_dev *dev)
input_sync(input);
}

static int __init gpio_mouse_probe(struct platform_device *pdev)
static int __devinit gpio_mouse_probe(struct platform_device *pdev)
{
struct gpio_mouse_platform_data *pdata = pdev->dev.platform_data;
struct input_polled_dev *input_poll;
Expand Down Expand Up @@ -170,10 +170,8 @@ static int __devexit gpio_mouse_remove(struct platform_device *pdev)
return 0;
}

/* work with hotplug and coldplug */
MODULE_ALIAS("platform:gpio_mouse");

static struct platform_driver gpio_mouse_device_driver = {
.probe = gpio_mouse_probe,
.remove = __devexit_p(gpio_mouse_remove),
.driver = {
.name = "gpio_mouse",
Expand All @@ -183,8 +181,7 @@ static struct platform_driver gpio_mouse_device_driver = {

static int __init gpio_mouse_init(void)
{
return platform_driver_probe(&gpio_mouse_device_driver,
gpio_mouse_probe);
return platform_driver_register(&gpio_mouse_device_driver);
}
module_init(gpio_mouse_init);

Expand All @@ -197,3 +194,5 @@ module_exit(gpio_mouse_exit);
MODULE_AUTHOR("Hans-Christian Egtvedt <hcegtvedt@atmel.com>");
MODULE_DESCRIPTION("GPIO mouse driver");
MODULE_LICENSE("GPL");
MODULE_ALIAS("platform:gpio_mouse"); /* work with hotplug and coldplug */

0 comments on commit f3bc631

Please sign in to comment.