Merge branch 'for-7.3/intel-thc-hid' into for-linus

- support for full I2C bus config parameters (Even Xu)

diff --cc drivers/hid/intel-thc-hid/intel-quicki2c/pci-quicki2c.c
index 4126c24,62bd872..93121dd
--- 1/drivers/hid/intel-thc-hid/intel-quicki2c/pci-quicki2c.c
--- 2/drivers/hid/intel-thc-hid/intel-quicki2c/pci-quicki2c.c
+++ b/drivers/hid/intel-thc-hid/intel-quicki2c/pci-quicki2c.c
@@@ -772,13 -788,13 +788,14 @@@ static void quicki2c_remove(struct pci_
                return;
  
        quicki2c_hid_remove(qcdev);
+ 
+       quicki2c_dev_deinit(qcdev);
+ 
        quicki2c_dma_deinit(qcdev);
  
 +      pm_runtime_dont_use_autosuspend(qcdev->dev);
        pm_runtime_get_noresume(qcdev->dev);
  
-       quicki2c_dev_deinit(qcdev);
- 
        pci_clear_master(pdev);
  }
  

diff --cc drivers/hid/intel-thc-hid/intel-quickspi/pci-quickspi.c
index 5d35edf,404f0d2..e0ae04d
--- 1/drivers/hid/intel-thc-hid/intel-quickspi/pci-quickspi.c
--- 2/drivers/hid/intel-thc-hid/intel-quickspi/pci-quickspi.c
+++ b/drivers/hid/intel-thc-hid/intel-quickspi/pci-quickspi.c
@@@ -718,13 -715,13 +722,14 @@@ static void quickspi_remove(struct pci_
                return;
  
        quickspi_hid_remove(qsdev);
+ 
+       quickspi_dev_deinit(qsdev);
+ 
        quickspi_dma_deinit(qsdev);
  
 +      pm_runtime_dont_use_autosuspend(qsdev->dev);
        pm_runtime_get_noresume(qsdev->dev);
  
-       quickspi_dev_deinit(qsdev);
- 
        pci_clear_master(pdev);
  }
  

diff --cc drivers/hid/intel-thc-hid/intel-quickspi/quickspi-dev.h
Simple merge

diff --cc drivers/hid/intel-thc-hid/intel-quickspi/quickspi-protocol.c
Simple merge