mirrors/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-05-06 07:34:03 -04:00
Code Issues Packages Projects Releases Wiki Activity

media: atomisp: use cpu_latency_qos_*() instead of pm_qos_update*()

Browse Source 
Those functions got renamed. Update them on atomisp driver.

Fixes: 67b06ba018 ("PM: QoS: Drop PM_QOS_CPU_DMA_LATENCY and rename related functions")
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
This commit is contained in:
Mauro Carvalho Chehab
2020-04-19 13:17:14 +02:00
parent a9d7bbcc6b
commit 8d564cd28c
1 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
drivers/staging/media/atomisp/pci/atomisp2/atomisp_v4l2.c
View File

@@ -508,7 +508,7 @@ int atomisp_runtime_suspend(struct device *dev)
ret = atomisp_ospm_dphy_down(isp);
if (ret)
return ret;
pm_qos_update_request(&isp->pm_qos, PM_QOS_DEFAULT_VALUE);
cpu_latency_qos_update_request(&isp->pm_qos, PM_QOS_DEFAULT_VALUE);
return atomisp_mrfld_power_down(isp);
}
@@ -522,7 +522,7 @@ int atomisp_runtime_resume(struct device *dev)
if (ret)
return ret;
pm_qos_update_request(&isp->pm_qos, isp->max_isr_latency);
cpu_latency_qos_update_request(&isp->pm_qos, isp->max_isr_latency);
if (isp->sw_contex.power_state == ATOM_ISP_POWER_DOWN) {
/*Turn on ISP d-phy */
ret = atomisp_ospm_dphy_up(isp);
@@ -574,7 +574,7 @@ static int __maybe_unused atomisp_suspend(struct device *dev)
dev_err(isp->dev, "fail to power off ISP\n");
return ret;
}
pm_qos_update_request(&isp->pm_qos, PM_QOS_DEFAULT_VALUE);
cpu_latency_qos_update_request(&isp->pm_qos, PM_QOS_DEFAULT_VALUE);
return atomisp_mrfld_power_down(isp);
}
@@ -588,7 +588,7 @@ static int __maybe_unused atomisp_resume(struct device *dev)
if (ret)
return ret;
pm_qos_update_request(&isp->pm_qos, isp->max_isr_latency);
cpu_latency_qos_update_request(&isp->pm_qos, isp->max_isr_latency);
/*Turn on ISP d-phy */
ret = atomisp_ospm_dphy_up(isp);
@@ -1347,8 +1347,7 @@ static int atomisp_pci_probe(struct pci_dev *dev,
atomisp_msi_irq_init(isp, dev);
pm_qos_add_request(&isp->pm_qos, PM_QOS_CPU_DMA_LATENCY,
PM_QOS_DEFAULT_VALUE);
cpu_latency_qos_update_request(&isp->pm_qos, PM_QOS_DEFAULT_VALUE);
/*
* for MRFLD, Software/firmware needs to write a 1 to bit 0 of
@@ -1460,7 +1459,7 @@ static int atomisp_pci_probe(struct pci_dev *dev,
register_entities_fail:
atomisp_uninitialize_modules(isp);
initialize_modules_fail:
pm_qos_remove_request(&isp->pm_qos);
cpu_latency_qos_remove_request(&isp->pm_qos);
atomisp_msi_irq_uninit(isp, dev);
enable_msi_fail:
fw_validation_fail:
@@ -1505,7 +1504,7 @@ static void atomisp_pci_remove(struct pci_dev *dev)
pm_runtime_forbid(&dev->dev);
pm_runtime_get_noresume(&dev->dev);
pm_qos_remove_request(&isp->pm_qos);
cpu_latency_qos_remove_request(&isp->pm_qos);
atomisp_msi_irq_uninit(isp, dev);
atomisp_unregister_entities(isp);