OSDN Git Service

Input: synaptics-rmi4 - fix spelling in defines
authorNick Dyer <nick.dyer@itdev.co.uk>
Thu, 19 May 2016 16:22:49 +0000 (09:22 -0700)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>
Thu, 19 May 2016 16:35:16 +0000 (09:35 -0700)
Signed-off-by: Nick Dyer <nick.dyer@itdev.co.uk>
Reviewed-by: Andrew Duggan <aduggan@synaptics.com>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
drivers/input/rmi4/rmi_f01.c

index eb362bc..fac81fc 100644 (file)
@@ -81,26 +81,26 @@ struct f01_basic_properties {
  * This bit disables whatever sleep mode may be selected by the sleep_mode
  * field and forces the device to run at full power without sleeping.
  */
-#define RMI_F01_CRTL0_NOSLEEP_BIT      BIT(2)
+#define RMI_F01_CTRL0_NOSLEEP_BIT      BIT(2)
 
 /*
  * When this bit is set, the touch controller employs a noise-filtering
  * algorithm designed for use with a connected battery charger.
  */
-#define RMI_F01_CRTL0_CHARGER_BIT      BIT(5)
+#define RMI_F01_CTRL0_CHARGER_BIT      BIT(5)
 
 /*
  * Sets the report rate for the device. The effect of this setting is
  * highly product dependent. Check the spec sheet for your particular
  * touch sensor.
  */
-#define RMI_F01_CRTL0_REPORTRATE_BIT   BIT(6)
+#define RMI_F01_CTRL0_REPORTRATE_BIT   BIT(6)
 
 /*
  * Written by the host as an indicator that the device has been
  * successfully configured.
  */
-#define RMI_F01_CRTL0_CONFIGURED_BIT   BIT(7)
+#define RMI_F01_CTRL0_CONFIGURED_BIT   BIT(7)
 
 /**
  * @ctrl0 - see the bit definitions above.
@@ -330,10 +330,10 @@ static int rmi_f01_probe(struct rmi_function *fn)
        case RMI_F01_NOSLEEP_DEFAULT:
                break;
        case RMI_F01_NOSLEEP_OFF:
-               f01->device_control.ctrl0 &= ~RMI_F01_CRTL0_NOSLEEP_BIT;
+               f01->device_control.ctrl0 &= ~RMI_F01_CTRL0_NOSLEEP_BIT;
                break;
        case RMI_F01_NOSLEEP_ON:
-               f01->device_control.ctrl0 |= RMI_F01_CRTL0_NOSLEEP_BIT;
+               f01->device_control.ctrl0 |= RMI_F01_CTRL0_NOSLEEP_BIT;
                break;
        }
 
@@ -349,7 +349,7 @@ static int rmi_f01_probe(struct rmi_function *fn)
                f01->device_control.ctrl0 &= ~RMI_F01_CTRL0_SLEEP_MODE_MASK;
        }
 
-       f01->device_control.ctrl0 |= RMI_F01_CRTL0_CONFIGURED_BIT;
+       f01->device_control.ctrl0 |= RMI_F01_CTRL0_CONFIGURED_BIT;
 
        error = rmi_write(rmi_dev, fn->fd.control_base_addr,
                          f01->device_control.ctrl0);
@@ -535,8 +535,8 @@ static int rmi_f01_suspend(struct rmi_function *fn)
        int error;
 
        f01->old_nosleep =
-               f01->device_control.ctrl0 & RMI_F01_CRTL0_NOSLEEP_BIT;
-       f01->device_control.ctrl0 &= ~RMI_F01_CRTL0_NOSLEEP_BIT;
+               f01->device_control.ctrl0 & RMI_F01_CTRL0_NOSLEEP_BIT;
+       f01->device_control.ctrl0 &= ~RMI_F01_CTRL0_NOSLEEP_BIT;
 
        f01->device_control.ctrl0 &= ~RMI_F01_CTRL0_SLEEP_MODE_MASK;
        if (device_may_wakeup(fn->rmi_dev->xport->dev))
@@ -549,7 +549,7 @@ static int rmi_f01_suspend(struct rmi_function *fn)
        if (error) {
                dev_err(&fn->dev, "Failed to write sleep mode: %d.\n", error);
                if (f01->old_nosleep)
-                       f01->device_control.ctrl0 |= RMI_F01_CRTL0_NOSLEEP_BIT;
+                       f01->device_control.ctrl0 |= RMI_F01_CTRL0_NOSLEEP_BIT;
                f01->device_control.ctrl0 &= ~RMI_F01_CTRL0_SLEEP_MODE_MASK;
                f01->device_control.ctrl0 |= RMI_SLEEP_MODE_NORMAL;
                return error;
@@ -564,7 +564,7 @@ static int rmi_f01_resume(struct rmi_function *fn)
        int error;
 
        if (f01->old_nosleep)
-               f01->device_control.ctrl0 |= RMI_F01_CRTL0_NOSLEEP_BIT;
+               f01->device_control.ctrl0 |= RMI_F01_CTRL0_NOSLEEP_BIT;
 
        f01->device_control.ctrl0 &= ~RMI_F01_CTRL0_SLEEP_MODE_MASK;
        f01->device_control.ctrl0 |= RMI_SLEEP_MODE_NORMAL;