Hi!
...rename u32 to pm_message_t in bus drivers. There is quite a lot of
bus drivers in the kernel, this is not yet complete :-(. I'm afraid
I'll do just the common buses and buses I use...
Pavel
--- linux.middle/arch/arm/common/amba.c 2004-10-19 14:37:35.000000000 +0200
+++ linux/arch/arm/common/amba.c 2004-11-04 00:28:43.000000000 +0100
@@ -59,7 +59,7 @@
#define amba_hotplug NULL
#endif
-static int amba_suspend(struct device *dev, u32 state)
+static int amba_suspend(struct device *dev, pm_message_t state)
{
struct amba_driver *drv = to_amba_driver(dev->driver);
int ret = 0;
--- linux.middle/arch/arm/common/locomo.c 2004-10-19 14:37:35.000000000 +0200
+++ linux/arch/arm/common/locomo.c 2004-11-04 00:29:01.000000000 +0100
@@ -673,7 +673,7 @@
return dev->devid == drv->devid;
}
-static int locomo_bus_suspend(struct device *dev, u32 state)
+static int locomo_bus_suspend(struct device *dev, pm_message_t state)
{
struct locomo_dev *ldev = LOCOMO_DEV(dev);
struct locomo_driver *drv = LOCOMO_DRV(dev->driver);
--- linux.middle/arch/arm/common/sa1111.c 2004-10-19 14:37:35.000000000 +0200
+++ linux/arch/arm/common/sa1111.c 2004-11-04 00:29:35.000000000 +0100
@@ -1185,7 +1185,7 @@
return dev->devid == drv->devid;
}
-static int sa1111_bus_suspend(struct device *dev, u32 state)
+static int sa1111_bus_suspend(struct device *dev, pm_message_t state)
{
struct sa1111_dev *sadev = SA1111_DEV(dev);
struct sa1111_driver *drv = SA1111_DRV(dev->driver);
--- linux.middle/drivers/base/platform.c 2004-10-19 14:37:56.000000000 +0200
+++ linux/drivers/base/platform.c 2004-11-04 00:31:33.000000000 +0100
@@ -238,7 +238,7 @@
return (strncmp(pdev->name, drv->name, BUS_ID_SIZE) == 0);
}
-static int platform_suspend(struct device * dev, u32 state)
+static int platform_suspend(struct device * dev, pm_message_t state)
{
int ret = 0;
--- linux.middle/drivers/ide/ide.c 2004-10-19 14:37:59.000000000 +0200
+++ linux/drivers/ide/ide.c 2004-11-04 00:32:27.000000000 +0100
@@ -1499,7 +1499,7 @@
return 1;
}
-static int generic_ide_suspend(struct device *dev, u32 state)
+static int generic_ide_suspend(struct device *dev, pm_message_t state)
{
ide_drive_t *drive = dev->driver_data;
struct request rq;
--- linux.middle/drivers/pci/pci-driver.c 2004-10-19 14:38:08.000000000 +0200
+++ linux/drivers/pci/pci-driver.c 2004-11-04 00:26:44.000000000 +0100
@@ -295,7 +295,7 @@
return 0;
}
-static int pci_device_suspend(struct device * dev, u32 state)
+static int pci_device_suspend(struct device * dev, pm_message_t state)
{
struct pci_dev * pci_dev = to_pci_dev(dev);
struct pci_driver * drv = pci_dev->driver;
--- linux.middle/include/linux/device.h 2004-10-19 14:39:10.000000000 +0200
+++ linux/include/linux/device.h 2004-11-04 00:25:52.000000000 +0100
@@ -61,7 +61,7 @@
int (*match)(struct device * dev, struct device_driver * drv);
int (*hotplug) (struct device *dev, char **envp,
int num_envp, char *buffer, int buffer_size);
- int (*suspend)(struct device * dev, u32 state);
+ int (*suspend)(struct device * dev, pm_message_t state);
int (*resume)(struct device * dev);
};
--
People were complaining that M$ turns users into beta-testers...
...jr ghea gurz vagb qrirybcref, naq gurl frrz gb yvxr vg gung jnl!
