Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

video: fbdev: skeletonfb: Convert to generic power management

PCI-specific power management (pci_driver.suspend and pci_driver.resume) is
deprecated. If drivers implement power management, they should use the
generic power management framework, not the PCI-specific hooks.

Convert the sample code to use the generic power management framework.

Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Acked-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Helge Deller <deller@gmx.de>

authored by

Bjorn Helgaas and committed by
Helge Deller
267173cb e146a096

+7 -6
+7 -6
drivers/video/fbdev/skeletonfb.c
··· 838 838 * 839 839 * See Documentation/driver-api/pm/devices.rst for more information 840 840 */ 841 - static int xxxfb_suspend(struct pci_dev *dev, pm_message_t msg) 841 + static int xxxfb_suspend(struct device *dev) 842 842 { 843 - struct fb_info *info = pci_get_drvdata(dev); 843 + struct fb_info *info = dev_get_drvdata(dev); 844 844 struct xxxfb_par *par = info->par; 845 845 846 846 /* suspend here */ ··· 853 853 * 854 854 * See Documentation/driver-api/pm/devices.rst for more information 855 855 */ 856 - static int xxxfb_resume(struct pci_dev *dev) 856 + static int xxxfb_resume(struct device *dev) 857 857 { 858 - struct fb_info *info = pci_get_drvdata(dev); 858 + struct fb_info *info = dev_get_drvdata(dev); 859 859 struct xxxfb_par *par = info->par; 860 860 861 861 /* resume here */ ··· 873 873 { 0, } 874 874 }; 875 875 876 + static SIMPLE_DEV_PM_OPS(xxxfb_pm_ops, xxxfb_suspend, xxxfb_resume); 877 + 876 878 /* For PCI drivers */ 877 879 static struct pci_driver xxxfb_driver = { 878 880 .name = "xxxfb", 879 881 .id_table = xxxfb_id_table, 880 882 .probe = xxxfb_probe, 881 883 .remove = xxxfb_remove, 882 - .suspend = xxxfb_suspend, /* optional but recommended */ 883 - .resume = xxxfb_resume, /* optional but recommended */ 884 + .driver.pm = xxxfb_pm_ops, /* optional but recommended */ 884 885 }; 885 886 886 887 MODULE_DEVICE_TABLE(pci, xxxfb_id_table);