* [PATCH] MENELAUS: Remove unnecessary pr_err definition
@ 2007-08-03 11:50 Felipe Balbi
2007-08-10 10:01 ` Tony Lindgren
0 siblings, 1 reply; 4+ messages in thread
From: Felipe Balbi @ 2007-08-03 11:50 UTC (permalink / raw)
To: linux-omap-open-source
Instead of defining a pr_err() macro, we can use dev_err() macro.
Signed-off-by: Felipe Balbi <felipe.lima@indt.org.br>
---
drivers/i2c/chips/menelaus.c | 13 +++++--------
1 files changed, 5 insertions(+), 8 deletions(-)
diff --git a/drivers/i2c/chips/menelaus.c b/drivers/i2c/chips/menelaus.c
index 484a23e..cc5940c 100644
--- a/drivers/i2c/chips/menelaus.c
+++ b/drivers/i2c/chips/menelaus.c
@@ -1,4 +1,3 @@
-#define DEBUG
/*
* drivers/i2c/chips/menelaus.c
*
@@ -51,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
@@ -157,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;
}
@@ -169,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;
}
@@ -1178,7 +1175,7 @@ static int menelaus_probe(struct i2c_client *client)
/* If a true probe check the device */
if ((rev = menelaus_read_reg(MENELAUS_REV)) < 0) {
- pr_err("device not found");
+ dev_err(&client->dev, "device not found");
err = -ENODEV;
goto fail1;
}
@@ -1207,7 +1204,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)
@@ -1257,7 +1254,7 @@ static int __init menelaus_init(void)
int res;
if ((res = i2c_add_driver(&menelaus_i2c_driver)) < 0) {
- pr_err("driver registration failed\n");
+ dev_err(&the_menelaus->client->dev, "driver registration failed\n");
return res;
}
--
1.5.3.rc3.107.g73a7
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH] MENELAUS: Remove unnecessary pr_err definition
2007-08-03 11:50 [PATCH] MENELAUS: Remove unnecessary pr_err definition Felipe Balbi
@ 2007-08-10 10:01 ` Tony Lindgren
2007-08-10 12:01 ` Felipe Balbi
0 siblings, 1 reply; 4+ messages in thread
From: Tony Lindgren @ 2007-08-10 10:01 UTC (permalink / raw)
To: Felipe Balbi; +Cc: linux-omap-open-source
* Felipe Balbi <felipe.lima@indt.org.br> [070803 04:52]:
> Instead of defining a pr_err() macro, we can use dev_err() macro.
This patch needs refreshing, it does not apply any longer.
Tony
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH] MENELAUS: Remove unnecessary pr_err definition
2007-08-10 10:01 ` Tony Lindgren
@ 2007-08-10 12:01 ` Felipe Balbi
2007-08-13 8:50 ` Tony Lindgren
0 siblings, 1 reply; 4+ messages in thread
From: Felipe Balbi @ 2007-08-10 12:01 UTC (permalink / raw)
To: tony; +Cc: linux-omap-open-source
Instead of defining a pr_err() macro, we can use dev_err() macro.
Signed-off-by: Felipe Balbi <felipe.lima@indt.org.br>
---
drivers/i2c/chips/menelaus.c | 13 +++++--------
1 files changed, 5 insertions(+), 8 deletions(-)
diff --git a/drivers/i2c/chips/menelaus.c b/drivers/i2c/chips/menelaus.c
index 48a7e2f..1c4d8ab 100644
--- a/drivers/i2c/chips/menelaus.c
+++ b/drivers/i2c/chips/menelaus.c
@@ -1,4 +1,3 @@
-#define DEBUG
/*
* Copyright (C) 2004 Texas Instruments, Inc.
*
@@ -50,8 +49,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
@@ -156,7 +153,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;
}
@@ -168,7 +165,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;
}
@@ -1178,7 +1175,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;
}
@@ -1207,7 +1204,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)
@@ -1259,7 +1256,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;
}
--
1.5.3.rc4.24.g5b56a
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2007-08-13 8:50 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-08-03 11:50 [PATCH] MENELAUS: Remove unnecessary pr_err definition Felipe Balbi
2007-08-10 10:01 ` Tony Lindgren
2007-08-10 12:01 ` Felipe Balbi
2007-08-13 8:50 ` Tony Lindgren
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox