Merge tag 'microblaze-3.15-rc1' of git://git.monstr.eu/linux-2.6-microblaze

[cascardo/linux.git] / drivers / macintosh / adb.c

diff --git a/drivers/macintosh/adb.c b/drivers/macintosh/adb.c
index 04a5049..9e9c567 100644 (file)
--- a/drivers/macintosh/adb.c
+++ b/drivers/macintosh/adb.c
@@ -38,7 +38,7 @@
 #include <linux/platform_device.h>
 #include <linux/mutex.h>
 
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
 #ifdef CONFIG_PPC
 #include <asm/prom.h>
 #include <asm/machdep.h>
@@ -193,8 +193,7 @@ static int adb_scan_bus(void)
                                        break;
 
                                noMovement = 0;
-                       }
-                       else {
+                       } else {
                                /*
                                 * No devices left at address i; move the
                                 * one(s) we moved to `highFree' back to i.
@@ -263,7 +262,7 @@ adb_reset_bus(void)
 /*
  * notify clients before sleep
  */
-static int adb_suspend(struct platform_device *dev, pm_message_t state)
+static int __adb_suspend(struct platform_device *dev, pm_message_t state)
 {
        adb_got_sleep = 1;
        /* We need to get a lock on the probe thread */
@@ -276,10 +275,25 @@ static int adb_suspend(struct platform_device *dev, pm_message_t state)
        return 0;
 }
 
+static int adb_suspend(struct device *dev)
+{
+       return __adb_suspend(to_platform_device(dev), PMSG_SUSPEND);
+}
+
+static int adb_freeze(struct device *dev)
+{
+       return __adb_suspend(to_platform_device(dev), PMSG_FREEZE);
+}
+
+static int adb_poweroff(struct device *dev)
+{
+       return __adb_suspend(to_platform_device(dev), PMSG_HIBERNATE);
+}
+
 /*
  * reset bus after sleep
  */
-static int adb_resume(struct platform_device *dev)
+static int __adb_resume(struct platform_device *dev)
 {
        adb_got_sleep = 0;
        up(&adb_probe_mutex);
@@ -287,6 +301,11 @@ static int adb_resume(struct platform_device *dev)
 
        return 0;
 }
+
+static int adb_resume(struct device *dev)
+{
+       return __adb_resume(to_platform_device(dev));
+}
 #endif /* CONFIG_PM */
 
 static int __init adb_init(void)
@@ -502,7 +521,7 @@ void
 adb_input(unsigned char *buf, int nb, int autopoll)
 {
        int i, id;
-       static int dump_adb_input = 0;
+       static int dump_adb_input;
        unsigned long flags;
        
        void (*handler)(unsigned char *, int, int);
@@ -624,8 +643,7 @@ do_adb_query(struct adb_request *req)
 {
        int     ret = -EINVAL;
 
-       switch(req->data[1])
-       {
+       switch(req->data[1]) {
        case ADB_QUERY_GETDEVINFO:
                if (req->nbytes < 3)
                        break;
@@ -697,7 +715,7 @@ static ssize_t adb_read(struct file *file, char __user *buf,
        int ret = 0;
        struct adbdev_state *state = file->private_data;
        struct adb_request *req;
-       DECLARE_WAITQUEUE(wait,current);
+       DECLARE_WAITQUEUE(wait, current);
        unsigned long flags;
 
        if (count < 2)
@@ -794,8 +812,8 @@ static ssize_t adb_write(struct file *file, const char __user *buf,
        }
        /* Special case for ADB_BUSRESET request, all others are sent to
           the controller */
-       else if ((req->data[0] == ADB_PACKET)&&(count > 1)
-               &&(req->data[1] == ADB_BUSRESET)) {
+       else if ((req->data[0] == ADB_PACKET) && (count > 1)
+               && (req->data[1] == ADB_BUSRESET)) {
                ret = do_adb_reset_bus();
                up(&adb_probe_mutex);
                atomic_dec(&state->n_pending);
@@ -831,14 +849,25 @@ static const struct file_operations adb_fops = {
        .release        = adb_release,
 };
 
+#ifdef CONFIG_PM
+static const struct dev_pm_ops adb_dev_pm_ops = {
+       .suspend = adb_suspend,
+       .resume = adb_resume,
+       /* Hibernate hooks */
+       .freeze = adb_freeze,
+       .thaw = adb_resume,
+       .poweroff = adb_poweroff,
+       .restore = adb_resume,
+};
+#endif
+
 static struct platform_driver adb_pfdrv = {
        .driver = {
                .name = "adb",
-       },
 #ifdef CONFIG_PM
-       .suspend = adb_suspend,
-       .resume = adb_resume,
+               .pm = &adb_dev_pm_ops,
 #endif
+       },
 };
 
 static struct platform_device adb_pfdev = {