diff options
Diffstat (limited to 'drivers/input/mouse')
| -rw-r--r-- | drivers/input/mouse/cyapa.c | 6 | ||||
| -rw-r--r-- | drivers/input/mouse/maplemouse.c | 10 |
2 files changed, 4 insertions, 12 deletions
diff --git a/drivers/input/mouse/cyapa.c b/drivers/input/mouse/cyapa.c index 5d99abea89aa..a8e9b9ab9f84 100644 --- a/drivers/input/mouse/cyapa.c +++ b/drivers/input/mouse/cyapa.c @@ -1462,9 +1462,9 @@ MODULE_DEVICE_TABLE(i2c, cyapa_id_table); #ifdef CONFIG_ACPI static const struct acpi_device_id cyapa_acpi_id[] = { - { "CYAP0000", 0 }, /* Gen3 trackpad with 0x67 I2C address. */ - { "CYAP0001", 0 }, /* Gen5 trackpad with 0x24 I2C address. */ - { "CYAP0002", 0 }, /* Gen6 trackpad with 0x24 I2C address. */ + { .id = "CYAP0000" }, /* Gen3 trackpad with 0x67 I2C address. */ + { .id = "CYAP0001" }, /* Gen5 trackpad with 0x24 I2C address. */ + { .id = "CYAP0002" }, /* Gen6 trackpad with 0x24 I2C address. */ { } }; MODULE_DEVICE_TABLE(acpi, cyapa_acpi_id); diff --git a/drivers/input/mouse/maplemouse.c b/drivers/input/mouse/maplemouse.c index 0c8f7d1b02aa..f67e3eb5841b 100644 --- a/drivers/input/mouse/maplemouse.c +++ b/drivers/input/mouse/maplemouse.c @@ -60,15 +60,13 @@ static void dc_mouse_close(struct input_dev *dev) { struct dc_mouse *mse = input_get_drvdata(dev); - maple_getcond_callback(mse->mdev, dc_mouse_callback, 0, - MAPLE_FUNC_MOUSE); + maple_getcond_callback(mse->mdev, NULL, 0, MAPLE_FUNC_MOUSE); } /* allow the mouse to be used */ static int probe_maple_mouse(struct device *dev) { struct maple_device *mdev = to_maple_dev(dev); - struct maple_driver *mdrv = to_maple_driver(dev->driver); int error; struct input_dev *input_dev; struct dc_mouse *mse; @@ -103,14 +101,10 @@ static int probe_maple_mouse(struct device *dev) error = input_register_device(input_dev); if (error) goto fail_register; - - mdev->driver = mdrv; - return error; fail_register: input_free_device(input_dev); - maple_set_drvdata(mdev, NULL); fail_nomem: kfree(mse); fail: @@ -122,9 +116,7 @@ static int remove_maple_mouse(struct device *dev) struct maple_device *mdev = to_maple_dev(dev); struct dc_mouse *mse = maple_get_drvdata(mdev); - mdev->callback = NULL; input_unregister_device(mse->dev); - maple_set_drvdata(mdev, NULL); kfree(mse); return 0; |