Merge omap-upstream

[linux-2.6-omap-h63xx.git] / drivers / i2c / chips / menelaus.c

diff --git a/drivers/i2c/chips/menelaus.c b/drivers/i2c/chips/menelaus.c
index d9c92c5e007730ac62f7140ef51f5edb9d5eafb3..9d759644ae0193c277599e2088a015b49cf3d957 100644 (file)
--- a/drivers/i2c/chips/menelaus.c
+++ b/drivers/i2c/chips/menelaus.c
@@ -1,3 +1,4 @@
+
 /*
  * Copyright (C) 2004 Texas Instruments, Inc.
  *
@@ -49,8 +50,6 @@
 
 #define DRIVER_NAME                    "menelaus"
 
-#define pr_err(fmt, arg...)    printk(KERN_ERR DRIVER_NAME ": ", ## arg);
-
 #define MENELAUS_I2C_ADDRESS           0x72
 
 #define MENELAUS_REV                   0x01
@@ -155,7 +154,7 @@ static int menelaus_write_reg(int reg, u8 value)
        int val = i2c_smbus_write_byte_data(the_menelaus->client, reg, value);
 
        if (val < 0) {
-               pr_err("write error");
+               dev_err(&the_menelaus->client->dev, "write error");
                return val;
        }
 
@@ -167,7 +166,7 @@ static int menelaus_read_reg(int reg)
        int val = i2c_smbus_read_byte_data(the_menelaus->client, reg);
 
        if (val < 0)
-               pr_err("read error");
+               dev_err(&the_menelaus->client->dev, "read error");
 
        return val;
 }
@@ -932,7 +931,7 @@ static int menelaus_set_time(struct device *dev, struct rtc_time *t)
                return status;
        status = menelaus_write_reg(MENELAUS_RTC_WKDAY, BIN2BCD(t->tm_wday));
        if (status < 0) {
-               dev_err(&the_menelaus->client->dev, "rtc write reg %02x "
+               dev_err(&the_menelaus->client->dev, "rtc write reg %02x"
                                "err %d\n", MENELAUS_RTC_WKDAY, status);
                return status;
        }
@@ -1177,7 +1176,7 @@ static int menelaus_probe(struct i2c_client *client)
        /* If a true probe check the device */
        rev = menelaus_read_reg(MENELAUS_REV);
        if (rev < 0) {
-               pr_err("device not found");
+               dev_err(&client->dev, "device not found");
                err = -ENODEV;
                goto fail1;
        }
@@ -1206,7 +1205,7 @@ static int menelaus_probe(struct i2c_client *client)
        mutex_init(&menelaus->lock);
        INIT_WORK(&menelaus->work, menelaus_work);
 
-       pr_info("Menelaus rev %d.%d\n", rev >> 4, rev & 0x0f);
+       dev_info(&client->dev, "Menelaus rev %d.%d\n", rev >> 4, rev & 0x0f);
 
        val = menelaus_read_reg(MENELAUS_VCORE_CTRL1);
        if (val < 0)
@@ -1258,7 +1257,7 @@ static int __init menelaus_init(void)
 
        res = i2c_add_driver(&menelaus_i2c_driver);
        if (res < 0) {
-               pr_err("driver registration failed\n");
+               dev_err(&the_menelaus->client->dev, "driver registration failed\n");
                return res;
        }