UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

media: meye: use generic power management 

With legacy PM, drivers themselves were responsible for managing the
device's power states and takes care of register states.

After upgrading to the generic structure, PCI core will take care of
required tasks and drivers should do only device-specific operations.

The driver was invoking PCI helper functions like pci_save/restore_state()
which is not recommended.

Compile-tested only.

Signed-off-by: Vaibhav Gupta <vaibhavgupta40@gmail.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
This commit is contained in:
Vaibhav Gupta 2020-07-17 09:34:35 +02:00 committed by Mauro Carvalho Chehab
parent a28b2ed9ad
commit 9c4a8489ab
1 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
drivers/media/pci/meye/meye.c
View File

@ -1528,19 +1528,16 @@ static const struct v4l2_ctrl_ops meye_ctrl_ops = {
.s_ctrl = meye_s_ctrl, .s_ctrl = meye_s_ctrl,
}; };
#ifdef CONFIG_PM static int __maybe_unused meye_suspend(struct device *dev)
static int meye_suspend(struct pci_dev *pdev, pm_message_t state)
{ {
pci_save_state(pdev);
meye.pm_mchip_mode = meye.mchip_mode; meye.pm_mchip_mode = meye.mchip_mode;
mchip_hic_stop(); mchip_hic_stop();
mchip_set(MCHIP_MM_INTA, 0x0); mchip_set(MCHIP_MM_INTA, 0x0);
return 0; return 0;
} }
static int meye_resume(struct pci_dev *pdev) static int __maybe_unused meye_resume(struct device *dev)
{ {
pci_restore_state(pdev);
pci_write_config_word(meye.mchip_dev, MCHIP_PCI_SOFTRESET_SET, 1); pci_write_config_word(meye.mchip_dev, MCHIP_PCI_SOFTRESET_SET, 1);
mchip_delay(MCHIP_HIC_CMD, 0); mchip_delay(MCHIP_HIC_CMD, 0);
@ -1562,7 +1559,6 @@ static int meye_resume(struct pci_dev *pdev)
} }
return 0; return 0;
} }
#endif
static int meye_probe(struct pci_dev *pcidev, const struct pci_device_id *ent) static int meye_probe(struct pci_dev *pcidev, const struct pci_device_id *ent)
{ {
@ -1788,15 +1784,14 @@ static const struct pci_device_id meye_pci_tbl[] = {
MODULE_DEVICE_TABLE(pci, meye_pci_tbl); MODULE_DEVICE_TABLE(pci, meye_pci_tbl);
static SIMPLE_DEV_PM_OPS(meye_pm_ops, meye_suspend, meye_resume);
static struct pci_driver meye_driver = { static struct pci_driver meye_driver = {
.name = "meye", .name = "meye",
.id_table = meye_pci_tbl, .id_table = meye_pci_tbl,
.probe = meye_probe, .probe = meye_probe,
.remove = meye_remove, .remove = meye_remove,
#ifdef CONFIG_PM .driver.pm = &meye_pm_ops,
.suspend = meye_suspend,
.resume = meye_resume,
#endif
}; };
static int __init meye_init(void) static int __init meye_init(void)