aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/input/misc/max8997_haptic.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/input/misc/max8997_haptic.c')
-rw-r--r--drivers/input/misc/max8997_haptic.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/input/misc/max8997_haptic.c b/drivers/input/misc/max8997_haptic.c
index 05b7b8bfaf0..e973133212a 100644
--- a/drivers/input/misc/max8997_haptic.c
+++ b/drivers/input/misc/max8997_haptic.c
@@ -241,7 +241,7 @@ static void max8997_haptic_close(struct input_dev *dev)
241 max8997_haptic_disable(chip); 241 max8997_haptic_disable(chip);
242} 242}
243 243
244static int __devinit max8997_haptic_probe(struct platform_device *pdev) 244static int max8997_haptic_probe(struct platform_device *pdev)
245{ 245{
246 struct max8997_dev *iodev = dev_get_drvdata(pdev->dev.parent); 246 struct max8997_dev *iodev = dev_get_drvdata(pdev->dev.parent);
247 const struct max8997_platform_data *pdata = 247 const struct max8997_platform_data *pdata =
@@ -354,7 +354,7 @@ err_free_mem:
354 return error; 354 return error;
355} 355}
356 356
357static int __devexit max8997_haptic_remove(struct platform_device *pdev) 357static int max8997_haptic_remove(struct platform_device *pdev)
358{ 358{
359 struct max8997_haptic *chip = platform_get_drvdata(pdev); 359 struct max8997_haptic *chip = platform_get_drvdata(pdev);
360 360
@@ -396,7 +396,7 @@ static struct platform_driver max8997_haptic_driver = {
396 .pm = &max8997_haptic_pm_ops, 396 .pm = &max8997_haptic_pm_ops,
397 }, 397 },
398 .probe = max8997_haptic_probe, 398 .probe = max8997_haptic_probe,
399 .remove = __devexit_p(max8997_haptic_remove), 399 .remove = max8997_haptic_remove,
400 .id_table = max8997_haptic_id, 400 .id_table = max8997_haptic_id,
401}; 401};
402module_platform_driver(max8997_haptic_driver); 402module_platform_driver(max8997_haptic_driver);