mirror of
https://github.com/torvalds/linux.git
synced 2025-12-07 20:06:24 +00:00
Merge branch 'for-6.19/intel-thc' into for-linus
This commit is contained in:
@@ -344,7 +344,6 @@ exit:
|
||||
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);
|
||||
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -339,7 +339,6 @@ end:
|
||||
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);
|
||||
|
||||
|
||||
@@ -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;
|
||||
|
||||
Reference in New Issue
Block a user