mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2026-05-02 15:43:35 -04:00
media: atomisp: Group cpu_latency_qos_add_request() call together with other PM calls
Group the cpu_latency_qos_add_request() call in probe() together with the other PM calls in probe(). This is a preparation patch for futher PM fixes / work. Signed-off-by: Hans de Goede <hdegoede@redhat.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
This commit is contained in:
committed by
Mauro Carvalho Chehab
parent
ba68b88da0
commit
3a9ceebd8f
@@ -1370,8 +1370,6 @@ static int atomisp_pci_probe(struct pci_dev *pdev, const struct pci_device_id *i
|
||||
|
||||
atomisp_msi_irq_init(isp);
|
||||
|
||||
cpu_latency_qos_add_request(&isp->pm_qos, PM_QOS_DEFAULT_VALUE);
|
||||
|
||||
/*
|
||||
* for MRFLD, Software/firmware needs to write a 1 to bit 0 of
|
||||
* the register at CSI_RECEIVER_SELECTION_REG to enable SH CSI
|
||||
@@ -1440,6 +1438,7 @@ static int atomisp_pci_probe(struct pci_dev *pdev, const struct pci_device_id *i
|
||||
isp->pm_domain.ops.suspend = atomisp_suspend;
|
||||
isp->pm_domain.ops.resume = atomisp_resume;
|
||||
|
||||
cpu_latency_qos_add_request(&isp->pm_qos, PM_QOS_DEFAULT_VALUE);
|
||||
dev_pm_domain_set(&pdev->dev, &isp->pm_domain);
|
||||
|
||||
pm_runtime_put_noidle(&pdev->dev);
|
||||
@@ -1486,11 +1485,11 @@ static int atomisp_pci_probe(struct pci_dev *pdev, const struct pci_device_id *i
|
||||
pm_runtime_forbid(&pdev->dev);
|
||||
pm_runtime_get_noresume(&pdev->dev);
|
||||
dev_pm_domain_set(&pdev->dev, NULL);
|
||||
cpu_latency_qos_remove_request(&isp->pm_qos);
|
||||
atomisp_unregister_entities(isp);
|
||||
error_uninitialize_modules:
|
||||
atomisp_uninitialize_modules(isp);
|
||||
error_irq_uninit:
|
||||
cpu_latency_qos_remove_request(&isp->pm_qos);
|
||||
atomisp_msi_irq_uninit(isp);
|
||||
pci_free_irq_vectors(pdev);
|
||||
error_release_firmware:
|
||||
|
||||
Reference in New Issue
Block a user