diff options
-rw-r--r-- | arch/ppc64/kernel/of_device.c | 2 | ||||
-rw-r--r-- | include/asm-ppc/macio.h | 2 | ||||
-rw-r--r-- | include/asm-ppc/ocp.h | 2 | ||||
-rw-r--r-- | include/asm-ppc/of_device.h | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/arch/ppc64/kernel/of_device.c b/arch/ppc64/kernel/of_device.c index b27a75f1b986..f4c825a69fa0 100644 --- a/arch/ppc64/kernel/of_device.c +++ b/arch/ppc64/kernel/of_device.c | |||
@@ -104,7 +104,7 @@ static int of_device_remove(struct device *dev) | |||
104 | return 0; | 104 | return 0; |
105 | } | 105 | } |
106 | 106 | ||
107 | static int of_device_suspend(struct device *dev, u32 state) | 107 | static int of_device_suspend(struct device *dev, pm_message_t state) |
108 | { | 108 | { |
109 | struct of_device * of_dev = to_of_device(dev); | 109 | struct of_device * of_dev = to_of_device(dev); |
110 | struct of_platform_driver * drv = to_of_platform_driver(dev->driver); | 110 | struct of_platform_driver * drv = to_of_platform_driver(dev->driver); |
diff --git a/include/asm-ppc/macio.h b/include/asm-ppc/macio.h index 00605bb88b2a..2cafc9978607 100644 --- a/include/asm-ppc/macio.h +++ b/include/asm-ppc/macio.h | |||
@@ -126,7 +126,7 @@ struct macio_driver | |||
126 | int (*probe)(struct macio_dev* dev, const struct of_match *match); | 126 | int (*probe)(struct macio_dev* dev, const struct of_match *match); |
127 | int (*remove)(struct macio_dev* dev); | 127 | int (*remove)(struct macio_dev* dev); |
128 | 128 | ||
129 | int (*suspend)(struct macio_dev* dev, u32 state); | 129 | int (*suspend)(struct macio_dev* dev, pm_message_t state); |
130 | int (*resume)(struct macio_dev* dev); | 130 | int (*resume)(struct macio_dev* dev); |
131 | int (*shutdown)(struct macio_dev* dev); | 131 | int (*shutdown)(struct macio_dev* dev); |
132 | 132 | ||
diff --git a/include/asm-ppc/ocp.h b/include/asm-ppc/ocp.h index 5ea44cabfaa4..b98db3cdae83 100644 --- a/include/asm-ppc/ocp.h +++ b/include/asm-ppc/ocp.h | |||
@@ -119,7 +119,7 @@ struct ocp_driver { | |||
119 | const struct ocp_device_id *id_table; /* NULL if wants all devices */ | 119 | const struct ocp_device_id *id_table; /* NULL if wants all devices */ |
120 | int (*probe) (struct ocp_device *dev); /* New device inserted */ | 120 | int (*probe) (struct ocp_device *dev); /* New device inserted */ |
121 | void (*remove) (struct ocp_device *dev); /* Device removed (NULL if not a hot-plug capable driver) */ | 121 | void (*remove) (struct ocp_device *dev); /* Device removed (NULL if not a hot-plug capable driver) */ |
122 | int (*suspend) (struct ocp_device *dev, u32 state); /* Device suspended */ | 122 | int (*suspend) (struct ocp_device *dev, pm_message_t state); /* Device suspended */ |
123 | int (*resume) (struct ocp_device *dev); /* Device woken up */ | 123 | int (*resume) (struct ocp_device *dev); /* Device woken up */ |
124 | struct device_driver driver; | 124 | struct device_driver driver; |
125 | }; | 125 | }; |
diff --git a/include/asm-ppc/of_device.h b/include/asm-ppc/of_device.h index 14441c629010..7229735a7c18 100644 --- a/include/asm-ppc/of_device.h +++ b/include/asm-ppc/of_device.h | |||
@@ -55,7 +55,7 @@ struct of_platform_driver | |||
55 | int (*probe)(struct of_device* dev, const struct of_match *match); | 55 | int (*probe)(struct of_device* dev, const struct of_match *match); |
56 | int (*remove)(struct of_device* dev); | 56 | int (*remove)(struct of_device* dev); |
57 | 57 | ||
58 | int (*suspend)(struct of_device* dev, u32 state); | 58 | int (*suspend)(struct of_device* dev, pm_message_t state); |
59 | int (*resume)(struct of_device* dev); | 59 | int (*resume)(struct of_device* dev); |
60 | int (*shutdown)(struct of_device* dev); | 60 | int (*shutdown)(struct of_device* dev); |
61 | 61 | ||