driver model: pass pm_message_t down to pci drivers

ChangeSet 1.2047, 2005/01/21 08:01:20-08:00, pavel@ucw.cz

	[PATCH] driver model: pass pm_message_t down to pci drivers
	
	This passes pm_message_t down to PCI drivers.  Ugly translation code can be
	removed and this will allow PCI devices to do right thing during swsusp
	snapshot -- like not unneccessarily blanking display.
	
	Only obscure /sysfs code passes anything but 3 to pci_device_suspend,
	anyway, so this is pretty close to a nop.
	
	Signed-off-by: Pavel Machek <pavel@suse.cz>
	Signed-off-by: Andrew Morton <akpm@osdl.org>
	Signed-off-by: Linus Torvalds <torvalds@osdl.org>



 drivers/pci/pci-driver.c |   15 +--------------
 include/linux/pci.h      |    4 ++--
 2 files changed, 3 insertions(+), 16 deletions(-)


diff -Nru a/drivers/pci/pci-driver.c b/drivers/pci/pci-driver.c
--- a/drivers/pci/pci-driver.c	2005-01-21 11:15:59 -08:00
+++ b/drivers/pci/pci-driver.c	2005-01-21 11:15:59 -08:00
@@ -288,23 +288,10 @@
 {
 	struct pci_dev * pci_dev = to_pci_dev(dev);
 	struct pci_driver * drv = pci_dev->driver;
-	u32 dev_state;
 	int i = 0;
 
-	/* Translate PM_SUSPEND_xx states to PCI device states */
-	static u32 state_conversion[] = {
-		[PM_SUSPEND_ON] = 0,
-		[PM_SUSPEND_STANDBY] = 1,
-		[PM_SUSPEND_MEM] = 3,
-		[PM_SUSPEND_DISK] = 3,
-	};
-
-	if (state >= sizeof(state_conversion) / sizeof(state_conversion[1]))
-		return -EINVAL;
-
-	dev_state = state_conversion[state];
 	if (drv && drv->suspend)
-		i = drv->suspend(pci_dev, dev_state);
+		i = drv->suspend(pci_dev, state);
 	else
 		pci_save_state(pci_dev);
 	return i;
diff -Nru a/include/linux/pci.h b/include/linux/pci.h
--- a/include/linux/pci.h	2005-01-21 11:15:59 -08:00
+++ b/include/linux/pci.h	2005-01-21 11:15:59 -08:00
@@ -667,7 +667,7 @@
 	const struct pci_device_id *id_table;	/* must be non-NULL for probe to be called
*/
 	int  (*probe)  (struct pci_dev *dev, const struct pci_device_id *id);	/* New device inserted
*/
 	void (*remove) (struct pci_dev *dev);	/* Device removed (NULL if not a hot-plug capable driver)
*/
-	int  (*suspend) (struct pci_dev *dev, u32 state);	/* Device suspended */
+	int  (*suspend) (struct pci_dev *dev, pm_message_t state);	/* Device suspended
*/
 	int  (*resume) (struct pci_dev *dev);	                /* Device woken up */
 	int  (*enable_wake) (struct pci_dev *dev, u32 state, int enable);   /* Enable wake event
*/
 
@@ -823,7 +823,7 @@
 int pci_save_state(struct pci_dev *dev);
 int pci_restore_state(struct pci_dev *dev);
 int pci_set_power_state(struct pci_dev *dev, pci_power_t state);
-pci_power_t pci_choose_state(struct pci_dev *dev, u32 state);
+pci_power_t pci_choose_state(struct pci_dev *dev, pm_message_t state);
 int pci_enable_wake(struct pci_dev *dev, pci_power_t state, int enable);
 
 /* Helper functions for low-level code (drivers/pci/setup-[bus,res].c) */