Merge branch 'irq-cleanup-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[pandora-kernel.git] / drivers / macintosh / therm_pm72.c

diff --git a/drivers/macintosh/therm_pm72.c b/drivers/macintosh/therm_pm72.c
index 4454927..f3a29f2 100644 (file)
--- a/drivers/macintosh/therm_pm72.c
+++ b/drivers/macintosh/therm_pm72.c
@@ -443,7 +443,7 @@ static int fan_read_reg(int reg, unsigned char *buf, int nb)
        tries = 0;
        for (;;) {
                nr = i2c_master_recv(fcu, buf, nb);
-               if (nr > 0 || (nr < 0 && nr != ENODEV) || tries >= 100)
+               if (nr > 0 || (nr < 0 && nr != -ENODEV) || tries >= 100)
                        break;
                msleep(10);
                ++tries;
@@ -464,7 +464,7 @@ static int fan_write_reg(int reg, const unsigned char *ptr, int nb)
        tries = 0;
        for (;;) {
                nw = i2c_master_send(fcu, buf, nb);
-               if (nw > 0 || (nw < 0 && nw != EIO) || tries >= 100)
+               if (nw > 0 || (nw < 0 && nw != -EIO) || tries >= 100)
                        break;
                msleep(10);
                ++tries;
@@ -2213,6 +2213,9 @@ static void fcu_lookup_fans(struct device_node *fcu_node)
 static int fcu_of_probe(struct platform_device* dev, const struct of_device_id *match)
 {
        state = state_detached;
+       of_dev = dev;
+
+       dev_info(&dev->dev, "PowerMac G5 Thermal control driver %s\n", VERSION);
 
        /* Lookup the fans in the device tree */
        fcu_lookup_fans(dev->dev.of_node);
@@ -2235,6 +2238,7 @@ static const struct of_device_id fcu_match[] =
        },
        {},
 };
+MODULE_DEVICE_TABLE(of, fcu_match);
 
 static struct of_platform_driver fcu_of_platform_driver = 
 {
@@ -2252,8 +2256,6 @@ static struct of_platform_driver fcu_of_platform_driver =
  */
 static int __init therm_pm72_init(void)
 {
-       struct device_node *np;
-
        rackmac = of_machine_is_compatible("RackMac3,1");
 
        if (!of_machine_is_compatible("PowerMac7,2") &&
@@ -2261,34 +2263,12 @@ static int __init therm_pm72_init(void)
            !rackmac)
                return -ENODEV;
 
-       printk(KERN_INFO "PowerMac G5 Thermal control driver %s\n", VERSION);
-
-       np = of_find_node_by_type(NULL, "fcu");
-       if (np == NULL) {
-               /* Some machines have strangely broken device-tree */
-               np = of_find_node_by_path("/u3@0,f8000000/i2c@f8001000/fan@15e");
-               if (np == NULL) {
-                           printk(KERN_ERR "Can't find FCU in device-tree !\n");
-                           return -ENODEV;
-               }
-       }
-       of_dev = of_platform_device_create(np, "temperature", NULL);
-       if (of_dev == NULL) {
-               printk(KERN_ERR "Can't register FCU platform device !\n");
-               return -ENODEV;
-       }
-
-       of_register_platform_driver(&fcu_of_platform_driver);
-       
-       return 0;
+       return of_register_platform_driver(&fcu_of_platform_driver);
 }
 
 static void __exit therm_pm72_exit(void)
 {
        of_unregister_platform_driver(&fcu_of_platform_driver);
-
-       if (of_dev)
-               of_device_unregister(of_dev);
 }
 
 module_init(therm_pm72_init);