Merge branch 'hwmon-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6

[powerpc.git] / drivers / hwmon / ams / ams-i2c.c

diff --git a/drivers/hwmon/ams/ams-i2c.c b/drivers/hwmon/ams/ams-i2c.c
index 0d24bdf..9577605 100644 (file)
--- a/drivers/hwmon/ams/ams-i2c.c
+++ b/drivers/hwmon/ams/ams-i2c.c
@@ -85,17 +85,17 @@ static int ams_i2c_write(u8 reg, u8 value)
 static int ams_i2c_cmd(enum ams_i2c_cmd cmd)
 {
        s32 result;
-       int remaining = HZ / 20;
+       int count = 3;
 
        ams_i2c_write(AMS_COMMAND, cmd);
-       mdelay(5);
+       msleep(5);
 
-       while (remaining) {
+       while (count--) {
                result = ams_i2c_read(AMS_COMMAND);
                if (result == 0 || result & 0x80)
                        return 0;
 
-               remaining = schedule_timeout(remaining);
+               schedule_timeout_uninterruptible(HZ / 20);
        }
 
        return -1;
@@ -263,7 +263,7 @@ int __init ams_i2c_init(struct device_node *np)
 {
        char *tmp_bus;
        int result;
-       u32 *prop;
+       const u32 *prop;
 
        mutex_lock(&ams_info.lock);
 
@@ -276,7 +276,7 @@ int __init ams_i2c_init(struct device_node *np)
        ams_info.bustype = BUS_I2C;
 
        /* look for bus either using "reg" or by path */
-       prop = (u32*)get_property(ams_info.of_node, "reg", NULL);
+       prop = of_get_property(ams_info.of_node, "reg", NULL);
        if (!prop) {
                result = -ENODEV;