移去rt

hc

2023-12-08 01573e231f18eb2d99162747186f59511f56b64d

 kernel/drivers/net/wireless/intersil/orinoco/orinoco_pci.h
..
..
@@ -18,51 +18,37 @@
18
18
 	void __iomem *attr_io;
19
19
 };
20
20
 
21
-#ifdef CONFIG_PM
22
-static int orinoco_pci_suspend(struct pci_dev *pdev, pm_message_t state)
21
+static int __maybe_unused orinoco_pci_suspend(struct device *dev_d)
23
22
 {
23
+	struct pci_dev *pdev = to_pci_dev(dev_d);
24
24
 	struct orinoco_private *priv = pci_get_drvdata(pdev);
25
25
 
26
26
 	orinoco_down(priv);
27
27
 	free_irq(pdev->irq, priv);
28
-	pci_save_state(pdev);
29
-	pci_disable_device(pdev);
30
-	pci_set_power_state(pdev, PCI_D3hot);
31
28
 
32
29
 	return 0;
33
30
 }
34
31
 
35
-static int orinoco_pci_resume(struct pci_dev *pdev)
32
+static int __maybe_unused orinoco_pci_resume(struct device *dev_d)
36
33
 {
34
+	struct pci_dev *pdev = to_pci_dev(dev_d);
37
35
 	struct orinoco_private *priv = pci_get_drvdata(pdev);
38
36
 	struct net_device *dev = priv->ndev;
39
37
 	int err;
40
-
41
-	pci_set_power_state(pdev, PCI_D0);
42
-	err = pci_enable_device(pdev);
43
-	if (err) {
44
-		printk(KERN_ERR "%s: pci_enable_device failed on resume\n",
45
-		       dev->name);
46
-		return err;
47
-	}
48
-	pci_restore_state(pdev);
49
38
 
50
39
 	err = request_irq(pdev->irq, orinoco_interrupt, IRQF_SHARED,
51
40
 			  dev->name, priv);
52
41
 	if (err) {
53
42
 		printk(KERN_ERR "%s: cannot re-allocate IRQ on resume\n",
54
43
 		       dev->name);
55
-		pci_disable_device(pdev);
56
44
 		return -EBUSY;
57
45
 	}
58
46
 
59
-	err = orinoco_up(priv);
60
-
61
-	return err;
47
+	return orinoco_up(priv);
62
48
 }
63
-#else
64
-#define orinoco_pci_suspend NULL
65
-#define orinoco_pci_resume NULL
66
-#endif
49
+
50
+static SIMPLE_DEV_PM_OPS(orinoco_pci_pm_ops,
51
+			 orinoco_pci_suspend,
52
+			 orinoco_pci_resume);
67
53
 
68
54
 #endif /* _ORINOCO_PCI_H */