93 files changed, 1413 insertions, 1416 deletions

diff --git a/arch/arm/common/locomo.c b/arch/arm/common/locomo.c
index ad55680726ed..557e52c1c869 100644
--- a/arch/arm/common/locomo.c
+++ b/arch/arm/common/locomo.c
@@ -550,9 +550,9 @@ struct locomo_save_data {
         u16     LCM_SPIMD;
 };
 
-static int locomo_suspend(struct device *dev, pm_message_t state)
+static int locomo_suspend(struct platform_device *dev, pm_message_t state)
 {
-        struct locomo *lchip = dev_get_drvdata(dev);
+        struct locomo *lchip = platform_get_drvdata(dev);
         struct locomo_save_data *save;
         unsigned long flags;
 
@@ -560,7 +560,7 @@ static int locomo_suspend(struct device *dev, pm_message_t state)
         if (!save)
                 return -ENOMEM;
 
-        dev->power.saved_state = (void *) save;
+        dev->dev.power.saved_state = (void *) save;
 
         spin_lock_irqsave(&lchip->lock, flags);
 
@@ -594,14 +594,14 @@ static int locomo_suspend(struct device *dev, pm_message_t state)
         return 0;
 }
 
-static int locomo_resume(struct device *dev)
+static int locomo_resume(struct platform_device *dev)
 {
-        struct locomo *lchip = dev_get_drvdata(dev);
+        struct locomo *lchip = platform_get_drvdata(dev);
         struct locomo_save_data *save;
         unsigned long r;
         unsigned long flags;
         
-        save = (struct locomo_save_data *) dev->power.saved_state;
+        save = (struct locomo_save_data *) dev->dev.power.saved_state;
         if (!save)
                 return 0;
 
@@ -760,27 +760,26 @@ static void __locomo_remove(struct locomo *lchip)
         kfree(lchip);
 }