fbdev: cyber2000fb: use generic power management (c62c0f57) · Commits · 戴 / test

Switch to the new generic framework by updating function signatures and define a "struct dev_pm_ops" variable to bind PM callbacks. This way we can remove the legacy .suspend & .resume bindings from "lxfb_driver". Signed-off-by:

Vaibhav Gupta <vaibhavgupta40@gmail.com> Cc: Bjorn Helgaas <helgaas@kernel.org> Cc: Bjorn Helgaas <bhelgaas@google.com> Cc: Bjorn Helgaas <bjorn@helgaas.com> Cc: Vaibhav Gupta <vaibhav.varodek@gmail.com> Cc: Sam Ravnborg <sam@ravnborg.org> Cc: Paul Mackerras <paulus@samba.org> Cc: Russell King <linux@armlinux.org.uk> Cc: Andres Salomon <dilinger@queued.net> CC: Antonino Daplas <adaplas@gmail.com> Cc: Shuah Khan <skhan@linuxfoundation.org> Signed-off-by:

Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com> Link: https://patchwork.freedesktop.org/patch/msgid/20200819185654.151170-9-vaibhavgupta40@gmail.com

drivers/video/fbdev/cyber2000fb.c

+8 −5

Original line number	Diff line number	Diff line
		@@ -1810,7 +1810,7 @@ static void cyberpro_pci_remove(struct pci_dev *dev)
		}
		}

		static int cyberpro_pci_suspend(struct pci_dev *dev, pm_message_t state)
		static int __maybe_unused cyberpro_pci_suspend(struct device *dev)
		{
		return 0;
		}
		@@ -1818,9 +1818,9 @@ static int cyberpro_pci_suspend(struct pci_dev *dev, pm_message_t state)
		/*
		* Re-initialise the CyberPro hardware
		*/
		static int cyberpro_pci_resume(struct pci_dev *dev)
		static int __maybe_unused cyberpro_pci_resume(struct device *dev)
		{
		struct cfb_info *cfb = pci_get_drvdata(dev);
		struct cfb_info *cfb = dev_get_drvdata(dev);

		if (cfb) {
		cyberpro_pci_enable_mmio(cfb);
		@@ -1846,12 +1846,15 @@ static struct pci_device_id cyberpro_pci_table[] = {

		MODULE_DEVICE_TABLE(pci, cyberpro_pci_table);

		static SIMPLE_DEV_PM_OPS(cyberpro_pci_pm_ops,
		cyberpro_pci_suspend,
		cyberpro_pci_resume);

		static struct pci_driver cyberpro_driver = {
		.name = "CyberPro",
		.probe = cyberpro_pci_probe,
		.remove = cyberpro_pci_remove,
		.suspend = cyberpro_pci_suspend,
		.resume = cyberpro_pci_resume,
		.driver.pm = &cyberpro_pci_pm_ops,
		.id_table = cyberpro_pci_table
		};

Admin message