1 files changed, 9 insertions, 8 deletions

diff --git a/drivers/input/joystick/iforce/iforce-main.c b/drivers/input/joystick/iforce/iforce-main.c
index 6f826b37d9aa..a2517fa72eb8 100644
--- a/drivers/input/joystick/iforce/iforce-main.c
+++ b/drivers/input/joystick/iforce/iforce-main.c
@@ -85,7 +85,7 @@ static struct iforce_device iforce_device[] = {
 
 static int iforce_playback(struct input_dev *dev, int effect_id, int value)
 {
-        struct iforce* iforce = dev->private;
+        struct iforce *iforce = input_get_drvdata(dev);
         struct iforce_core_effect *core_effect = &iforce->core_effects[effect_id];
 
         if (value > 0)
@@ -99,7 +99,7 @@ static int iforce_playback(struct input_dev *dev, int effect_id, int value)
 
 static void iforce_set_gain(struct input_dev *dev, u16 gain)
 {
-        struct iforce* iforce = dev->private;
+        struct iforce *iforce = input_get_drvdata(dev);
         unsigned char data[3];
 
         data[0] = gain >> 9;
@@ -108,7 +108,7 @@ static void iforce_set_gain(struct input_dev *dev, u16 gain)
 
 static void iforce_set_autocenter(struct input_dev *dev, u16 magnitude)
 {
-        struct iforce* iforce = dev->private;
+        struct iforce *iforce = input_get_drvdata(dev);
         unsigned char data[3];
 
         data[0] = 0x03;
@@ -126,7 +126,7 @@ static void iforce_set_autocenter(struct input_dev *dev, u16 magnitude)
  */
 static int iforce_upload_effect(struct input_dev *dev, struct ff_effect *effect, struct ff_effect *old)
 {
-        struct iforce* iforce = dev->private;
+        struct iforce *iforce = input_get_drvdata(dev);
         struct iforce_core_effect *core_effect = &iforce->core_effects[effect->id];
         int ret;
 
@@ -173,7 +173,7 @@ static int iforce_upload_effect(struct input_dev *dev, struct ff_effect *effect,
  */
 static int iforce_erase_effect(struct input_dev *dev, int effect_id)
 {
-        struct iforce *iforce = dev->private;
+        struct iforce *iforce = input_get_drvdata(dev);
         struct iforce_core_effect *core_effect = &iforce->core_effects[effect_id];
         int err = 0;
 
@@ -191,7 +191,7 @@ static int iforce_erase_effect(struct input_dev *dev, int effect_id)
 
 static int iforce_open(struct input_dev *dev)
 {
-        struct iforce *iforce = dev->private;
+        struct iforce *iforce = input_get_drvdata(dev);
 
         switch (iforce->bus) {
 #ifdef CONFIG_JOYSTICK_IFORCE_USB
@@ -213,7 +213,7 @@ static int iforce_open(struct input_dev *dev)
 
 static void iforce_release(struct input_dev *dev)
 {
-        struct iforce *iforce = dev->private;
+        struct iforce *iforce = input_get_drvdata(dev);
         int i;
 
         if (test_bit(EV_FF, dev->evbit)) {
@@ -298,7 +298,8 @@ int iforce_init_device(struct iforce *iforce)
 #endif
         }
 
-        input_dev->private = iforce;
+        input_set_drvdata(input_dev, iforce);
+
         input_dev->name = "Unknown I-Force device";
         input_dev->open = iforce_open;
         input_dev->close = iforce_release;