HID: Intel-thc-hid: Intel-quickspi: Correct device state names gramatically

Correct quickspi device state name and change the list order to follow
device state working flow.

Signed-off-by: Even Xu <even.xu@intel.com>
Signed-off-by: Jiri Kosina <jkosina@suse.com>

diff --git a/drivers/hid/intel-thc-hid/intel-quickspi/pci-quickspi.c b/drivers/hid/intel-thc-hid/intel-quickspi/pci-quickspi.c
index 514b199cb88401f5f067c6c4dc781bb3d286821b..1f97f87960bd405bfec54eab895ddf432f6ddf0d 100644 (file)
--- a/drivers/hid/intel-thc-hid/intel-quickspi/pci-quickspi.c
+++ b/drivers/hid/intel-thc-hid/intel-quickspi/pci-quickspi.c
@@ -426,7 +426,7 @@ static struct quickspi_device *quickspi_dev_init(struct pci_dev *pdev, void __io
 
        thc_interrupt_enable(qsdev->thc_hw, true);
 
-       qsdev->state = QUICKSPI_INITED;
+       qsdev->state = QUICKSPI_INITIATED;
 
        return qsdev;
 }

diff --git a/drivers/hid/intel-thc-hid/intel-quickspi/quickspi-dev.h b/drivers/hid/intel-thc-hid/intel-quickspi/quickspi-dev.h
index 75179bb267677f5848fbf66bece38858674bf71c..6fdf674b21c5a68ad1e5775a84ed0a3344aa5bec 100644 (file)
--- a/drivers/hid/intel-thc-hid/intel-quickspi/quickspi-dev.h
+++ b/drivers/hid/intel-thc-hid/intel-quickspi/quickspi-dev.h
@@ -57,9 +57,9 @@
 
 enum quickspi_dev_state {
        QUICKSPI_NONE,
+       QUICKSPI_INITIATED,
        QUICKSPI_RESETING,
-       QUICKSPI_RESETED,
-       QUICKSPI_INITED,
+       QUICKSPI_RESET,
        QUICKSPI_ENABLED,
        QUICKSPI_DISABLED,
 };

diff --git a/drivers/hid/intel-thc-hid/intel-quickspi/quickspi-protocol.c b/drivers/hid/intel-thc-hid/intel-quickspi/quickspi-protocol.c
index 7373238ceb18bcbba538ec9a5c6c49d145e54deb..935a6684926c51f8efbec751bf7df46368fe9a78 100644 (file)
--- a/drivers/hid/intel-thc-hid/intel-quickspi/quickspi-protocol.c
+++ b/drivers/hid/intel-thc-hid/intel-quickspi/quickspi-protocol.c
@@ -333,7 +333,7 @@ int reset_tic(struct quickspi_device *qsdev)
                return -EINVAL;
        }
 
-       qsdev->state = QUICKSPI_RESETED;
+       qsdev->state = QUICKSPI_RESET;
 
        ret = quickspi_get_device_descriptor(qsdev);
        if (ret)