These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / drivers / input / misc / arizona-haptics.c

diff --git a/kernel/drivers/input/misc/arizona-haptics.c b/kernel/drivers/input/misc/arizona-haptics.c
index 4dbbed7..d5994a7 100644 (file)
--- a/kernel/drivers/input/misc/arizona-haptics.c
+++ b/kernel/drivers/input/misc/arizona-haptics.c
@@ -97,8 +97,7 @@ static void arizona_haptics_work(struct work_struct *work)
 
                ret = regmap_update_bits(arizona->regmap,
                                         ARIZONA_HAPTICS_CONTROL_1,
-                                        ARIZONA_HAP_CTRL_MASK,
-                                        1 << ARIZONA_HAP_CTRL_SHIFT);
+                                        ARIZONA_HAP_CTRL_MASK, 0);
                if (ret != 0) {
                        dev_err(arizona->dev, "Failed to stop haptics: %d\n",
                                ret);
@@ -170,8 +169,8 @@ static int arizona_haptics_probe(struct platform_device *pdev)
 
        INIT_WORK(&haptics->work, arizona_haptics_work);
 
-       haptics->input_dev = input_allocate_device();
-       if (haptics->input_dev == NULL) {
+       haptics->input_dev = devm_input_allocate_device(&pdev->dev);
+       if (!haptics->input_dev) {
                dev_err(arizona->dev, "Failed to allocate input device\n");
                return -ENOMEM;
        }
@@ -188,41 +187,23 @@ static int arizona_haptics_probe(struct platform_device *pdev)
        if (ret < 0) {
                dev_err(arizona->dev, "input_ff_create_memless() failed: %d\n",
                        ret);
-               goto err_ialloc;
+               return ret;
        }
 
        ret = input_register_device(haptics->input_dev);
        if (ret < 0) {
                dev_err(arizona->dev, "couldn't register input device: %d\n",
                        ret);
-               goto err_iff;
+               return ret;
        }
 
        platform_set_drvdata(pdev, haptics);
 
-       return 0;
-
-err_iff:
-       if (haptics->input_dev)
-               input_ff_destroy(haptics->input_dev);
-err_ialloc:
-       input_free_device(haptics->input_dev);
-
-       return ret;
-}
-
-static int arizona_haptics_remove(struct platform_device *pdev)
-{
-       struct arizona_haptics *haptics = platform_get_drvdata(pdev);
-
-       input_unregister_device(haptics->input_dev);
-
        return 0;
 }
 
 static struct platform_driver arizona_haptics_driver = {
        .probe          = arizona_haptics_probe,
-       .remove         = arizona_haptics_remove,
        .driver         = {
                .name   = "arizona-haptics",
        },