Commit b68822a9 authored by Jiri Kosina's avatar Jiri Kosina
Browse files

Merge branch 'for-6.19/intel-thc' into for-linus

parents 4b2dda73 c430f56b

drivers/hid/intel-thc-hid/intel-quicki2c/pci-quicki2c.c

+0 −2
Original line number Diff line number Diff line
@@ -344,7 +344,6 @@ static irqreturn_t quicki2c_irq_thread_handler(int irq, void *dev_id) 
		if (try_recover(qcdev))

			qcdev->state = QUICKI2C_DISABLED;



	pm_runtime_mark_last_busy(qcdev->dev);

	pm_runtime_put_autosuspend(qcdev->dev);



	return IRQ_HANDLED;
@@ -735,7 +734,6 @@ static int quicki2c_probe(struct pci_dev *pdev, const struct pci_device_id *id) 
	/* Enable runtime power management */

	pm_runtime_use_autosuspend(qcdev->dev);

	pm_runtime_set_autosuspend_delay(qcdev->dev, DEFAULT_AUTO_SUSPEND_DELAY_MS);

	pm_runtime_mark_last_busy(qcdev->dev);

	pm_runtime_put_noidle(qcdev->dev);

	pm_runtime_put_autosuspend(qcdev->dev);

drivers/hid/intel-thc-hid/intel-quicki2c/quicki2c-hid.c

+0 −1
Original line number Diff line number Diff line
@@ -72,7 +72,6 @@ static int quicki2c_hid_raw_request(struct hid_device *hid, 
		break;

	}



	pm_runtime_mark_last_busy(qcdev->dev);

	pm_runtime_put_autosuspend(qcdev->dev);



	return ret;

drivers/hid/intel-thc-hid/intel-quickspi/pci-quickspi.c

+0 −2
Original line number Diff line number Diff line
@@ -339,7 +339,6 @@ static irqreturn_t quickspi_irq_thread_handler(int irq, void *dev_id) 
		if (try_recover(qsdev))

			qsdev->state = QUICKSPI_DISABLED;



	pm_runtime_mark_last_busy(qsdev->dev);

	pm_runtime_put_autosuspend(qsdev->dev);



	return IRQ_HANDLED;
@@ -674,7 +673,6 @@ static int quickspi_probe(struct pci_dev *pdev, 
	/* Enable runtime power management */

	pm_runtime_use_autosuspend(qsdev->dev);

	pm_runtime_set_autosuspend_delay(qsdev->dev, DEFAULT_AUTO_SUSPEND_DELAY_MS);

	pm_runtime_mark_last_busy(qsdev->dev);

	pm_runtime_put_noidle(qsdev->dev);

	pm_runtime_put_autosuspend(qsdev->dev);

drivers/hid/intel-thc-hid/intel-quickspi/quickspi-hid.c

+0 −1
Original line number Diff line number Diff line
@@ -71,7 +71,6 @@ static int quickspi_hid_raw_request(struct hid_device *hid, 
		break;

	}



	pm_runtime_mark_last_busy(qsdev->dev);

	pm_runtime_put_autosuspend(qsdev->dev);



	return ret;