diff options
-rw-r--r-- | drivers/pcmcia/au1000_generic.c | 2 | ||||
-rw-r--r-- | drivers/pcmcia/hd64465_ss.c | 2 | ||||
-rw-r--r-- | drivers/pcmcia/m32r_cfc.c | 2 | ||||
-rw-r--r-- | drivers/pcmcia/m32r_pcc.c | 2 | ||||
-rw-r--r-- | drivers/pcmcia/pxa2xx_base.c | 2 | ||||
-rw-r--r-- | drivers/pcmcia/sa1100_generic.c | 2 | ||||
-rw-r--r-- | drivers/pcmcia/sa1111_generic.c | 2 | ||||
-rw-r--r-- | drivers/pcmcia/vrc4171_card.c | 2 |
8 files changed, 8 insertions, 8 deletions
diff --git a/drivers/pcmcia/au1000_generic.c b/drivers/pcmcia/au1000_generic.c index 9fa7f15d89e5..0a5c95807cf2 100644 --- a/drivers/pcmcia/au1000_generic.c +++ b/drivers/pcmcia/au1000_generic.c | |||
@@ -518,7 +518,7 @@ static int au1x00_drv_pcmcia_probe(struct device *dev) | |||
518 | } | 518 | } |
519 | 519 | ||
520 | 520 | ||
521 | static int au1x00_drv_pcmcia_suspend(struct device *dev, u32 state, u32 level) | 521 | static int au1x00_drv_pcmcia_suspend(struct device *dev, pm_message_t state, u32 level) |
522 | { | 522 | { |
523 | int ret = 0; | 523 | int ret = 0; |
524 | if (level == SUSPEND_SAVE_STATE) | 524 | if (level == SUSPEND_SAVE_STATE) |
diff --git a/drivers/pcmcia/hd64465_ss.c b/drivers/pcmcia/hd64465_ss.c index 5e6c4ba7d995..5ab55ae0ac36 100644 --- a/drivers/pcmcia/hd64465_ss.c +++ b/drivers/pcmcia/hd64465_ss.c | |||
@@ -845,7 +845,7 @@ static void hs_exit_socket(hs_socket_t *sp) | |||
845 | local_irq_restore(flags); | 845 | local_irq_restore(flags); |
846 | } | 846 | } |
847 | 847 | ||
848 | static int hd64465_suspend(struct device *dev, u32 state, u32 level) | 848 | static int hd64465_suspend(struct device *dev, pm_message_t state, u32 level) |
849 | { | 849 | { |
850 | int ret = 0; | 850 | int ret = 0; |
851 | if (level == SUSPEND_SAVE_STATE) | 851 | if (level == SUSPEND_SAVE_STATE) |
diff --git a/drivers/pcmcia/m32r_cfc.c b/drivers/pcmcia/m32r_cfc.c index b0b7a7a41120..581bfa95429e 100644 --- a/drivers/pcmcia/m32r_cfc.c +++ b/drivers/pcmcia/m32r_cfc.c | |||
@@ -743,7 +743,7 @@ static struct pccard_operations pcc_operations = { | |||
743 | 743 | ||
744 | /*====================================================================*/ | 744 | /*====================================================================*/ |
745 | 745 | ||
746 | static int m32r_pcc_suspend(struct device *dev, u32 state, u32 level) | 746 | static int m32r_pcc_suspend(struct device *dev, pm_message_t state, u32 level) |
747 | { | 747 | { |
748 | int ret = 0; | 748 | int ret = 0; |
749 | if (level == SUSPEND_SAVE_STATE) | 749 | if (level == SUSPEND_SAVE_STATE) |
diff --git a/drivers/pcmcia/m32r_pcc.c b/drivers/pcmcia/m32r_pcc.c index cafba6f45dfa..c0997c4714f0 100644 --- a/drivers/pcmcia/m32r_pcc.c +++ b/drivers/pcmcia/m32r_pcc.c | |||
@@ -696,7 +696,7 @@ static struct pccard_operations pcc_operations = { | |||
696 | 696 | ||
697 | /*====================================================================*/ | 697 | /*====================================================================*/ |
698 | 698 | ||
699 | static int m32r_pcc_suspend(struct device *dev, u32 state, u32 level) | 699 | static int m32r_pcc_suspend(struct device *dev, pm_message_t state, u32 level) |
700 | { | 700 | { |
701 | int ret = 0; | 701 | int ret = 0; |
702 | if (level == SUSPEND_SAVE_STATE) | 702 | if (level == SUSPEND_SAVE_STATE) |
diff --git a/drivers/pcmcia/pxa2xx_base.c b/drivers/pcmcia/pxa2xx_base.c index a6936a75a87e..3e23cd461fb1 100644 --- a/drivers/pcmcia/pxa2xx_base.c +++ b/drivers/pcmcia/pxa2xx_base.c | |||
@@ -205,7 +205,7 @@ int pxa2xx_drv_pcmcia_probe(struct device *dev) | |||
205 | } | 205 | } |
206 | EXPORT_SYMBOL(pxa2xx_drv_pcmcia_probe); | 206 | EXPORT_SYMBOL(pxa2xx_drv_pcmcia_probe); |
207 | 207 | ||
208 | static int pxa2xx_drv_pcmcia_suspend(struct device *dev, u32 state, u32 level) | 208 | static int pxa2xx_drv_pcmcia_suspend(struct device *dev, pm_message_t state, u32 level) |
209 | { | 209 | { |
210 | int ret = 0; | 210 | int ret = 0; |
211 | if (level == SUSPEND_SAVE_STATE) | 211 | if (level == SUSPEND_SAVE_STATE) |
diff --git a/drivers/pcmcia/sa1100_generic.c b/drivers/pcmcia/sa1100_generic.c index 874990ebe147..f1bb79153021 100644 --- a/drivers/pcmcia/sa1100_generic.c +++ b/drivers/pcmcia/sa1100_generic.c | |||
@@ -75,7 +75,7 @@ static int sa11x0_drv_pcmcia_probe(struct device *dev) | |||
75 | return ret; | 75 | return ret; |
76 | } | 76 | } |
77 | 77 | ||
78 | static int sa11x0_drv_pcmcia_suspend(struct device *dev, u32 state, u32 level) | 78 | static int sa11x0_drv_pcmcia_suspend(struct device *dev, pm_message_t state, u32 level) |
79 | { | 79 | { |
80 | int ret = 0; | 80 | int ret = 0; |
81 | if (level == SUSPEND_SAVE_STATE) | 81 | if (level == SUSPEND_SAVE_STATE) |
diff --git a/drivers/pcmcia/sa1111_generic.c b/drivers/pcmcia/sa1111_generic.c index bd9d6b2fad68..b441f43a6a55 100644 --- a/drivers/pcmcia/sa1111_generic.c +++ b/drivers/pcmcia/sa1111_generic.c | |||
@@ -158,7 +158,7 @@ static int __devexit pcmcia_remove(struct sa1111_dev *dev) | |||
158 | return 0; | 158 | return 0; |
159 | } | 159 | } |
160 | 160 | ||
161 | static int pcmcia_suspend(struct sa1111_dev *dev, u32 state) | 161 | static int pcmcia_suspend(struct sa1111_dev *dev, pm_message_t state) |
162 | { | 162 | { |
163 | return pcmcia_socket_dev_suspend(&dev->dev, state); | 163 | return pcmcia_socket_dev_suspend(&dev->dev, state); |
164 | } | 164 | } |
diff --git a/drivers/pcmcia/vrc4171_card.c b/drivers/pcmcia/vrc4171_card.c index 987bc21ced42..17bb2da6752b 100644 --- a/drivers/pcmcia/vrc4171_card.c +++ b/drivers/pcmcia/vrc4171_card.c | |||
@@ -774,7 +774,7 @@ static int __devinit vrc4171_card_setup(char *options) | |||
774 | 774 | ||
775 | __setup("vrc4171_card=", vrc4171_card_setup); | 775 | __setup("vrc4171_card=", vrc4171_card_setup); |
776 | 776 | ||
777 | static int vrc4171_card_suspend(struct device *dev, u32 state, u32 level) | 777 | static int vrc4171_card_suspend(struct device *dev, pm_message_t state, u32 level) |
778 | { | 778 | { |
779 | int retval = 0; | 779 | int retval = 0; |
780 | 780 | ||