The patch titled
Remove current defines and uses of pr_err, add pr_emerg, pr_alert, pr_crit, pr_err, pr_warn, pr_notice to include/linux/kernel.h
has been removed from the -mm tree. Its filename was
remove-current-defines-and-uses-of-pr_err-add-pr_emerg.patch
This patch was dropped because an updated version will be merged
------------------------------------------------------
Subject: Remove current defines and uses of pr_err, add pr_emerg, pr_alert, pr_crit, pr_err, pr_warn, pr_notice to include/linux/kernel.h
From: Joe Perches <joe@xxxxxxxxxxx>
Remove current #define and uses of pr_err
Add pr_emerg, pr_alert, pr_crit, pr_err, pr_warn, pr_notice
to include/linux/kernel.h
Signed-off-by: Joe Perches <joe@xxxxxxxxxxx>
Cc: Jean Delvare <khali@xxxxxxxxxxxx>
Cc: Jeff Garzik <jeff@xxxxxxxxxx>
Cc: "Antonino A. Daplas" <adaplas@xxxxxxx>
Cc: Greg KH <greg@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
drivers/i2c/chips/menelaus.c | 11 +++++------
drivers/net/spider_net.c | 17 +++++++++--------
drivers/net/spider_net.h | 3 ---
drivers/video/omap/lcd_h3.c | 7 +++----
drivers/video/omap/lcd_inn1610.c | 7 +++----
include/linux/kernel.h | 16 ++++++++++------
6 files changed, 30 insertions(+), 31 deletions(-)
diff -puN drivers/i2c/chips/menelaus.c~remove-current-defines-and-uses-of-pr_err-add-pr_emerg drivers/i2c/chips/menelaus.c
--- a/drivers/i2c/chips/menelaus.c~remove-current-defines-and-uses-of-pr_err-add-pr_emerg
+++ a/drivers/i2c/chips/menelaus.c
@@ -49,8 +49,7 @@
#include <asm/arch/menelaus.h>
#define DRIVER_NAME "menelaus"
-
-#define pr_err(fmt, arg...) printk(KERN_ERR DRIVER_NAME ": ", ## arg);
+#define PFX DRIVER_NAME ": "
#define MENELAUS_I2C_ADDRESS 0x72
@@ -156,7 +155,7 @@ static int menelaus_write_reg(int reg, u
int val = i2c_smbus_write_byte_data(the_menelaus->client, reg, value);
if (val < 0) {
- pr_err("write error");
+ printk(KERN_ERR PFX "write error\n");
return val;
}
@@ -168,7 +167,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");
+ printk(KERN_ERR PFX "read error\n");
return val;
}
@@ -1178,7 +1177,7 @@ static int menelaus_probe(struct i2c_cli
/* If a true probe check the device */
rev = menelaus_read_reg(MENELAUS_REV);
if (rev < 0) {
- pr_err("device not found");
+ printk(KERN_ERR PFX "device not found\n");
err = -ENODEV;
goto fail1;
}
@@ -1259,7 +1258,7 @@ static int __init menelaus_init(void)
res = i2c_add_driver(&menelaus_i2c_driver);
if (res < 0) {
- pr_err("driver registration failed\n");
+ printk(KERN_ERR PFX "driver registration failed\n");
return res;
}
diff -puN drivers/net/spider_net.c~remove-current-defines-and-uses-of-pr_err-add-pr_emerg drivers/net/spider_net.c
--- a/drivers/net/spider_net.c~remove-current-defines-and-uses-of-pr_err-add-pr_emerg
+++ a/drivers/net/spider_net.c
@@ -1238,14 +1238,15 @@ spider_net_decode_one_descr(struct spide
if (hwdescr->dmac_cmd_status & SPIDER_NET_DESCR_BAD_STATUS) {
dev_err(&card->netdev->dev, "bad status, cmd_status=x%08x\n",
hwdescr->dmac_cmd_status);
- pr_err("buf_addr=x%08x\n", hw_buf_addr);
- pr_err("buf_size=x%08x\n", hwdescr->buf_size);
- pr_err("next_descr_addr=x%08x\n", hwdescr->next_descr_addr);
- pr_err("result_size=x%08x\n", hwdescr->result_size);
- pr_err("valid_size=x%08x\n", hwdescr->valid_size);
- pr_err("data_status=x%08x\n", hwdescr->data_status);
- pr_err("data_error=x%08x\n", hwdescr->data_error);
- pr_err("which=%ld\n", descr - card->rx_chain.ring);
+ printk(KERN_ERR "buf_addr=x%08x\n", hw_buf_addr);
+ printk(KERN_ERR "buf_size=x%08x\n", hwdescr->buf_size);
+ printk(KERN_ERR "next_descr_addr=x%08x\n",
+ hwdescr->next_descr_addr);
+ printk(KERN_ERR "result_size=x%08x\n", hwdescr->result_size);
+ printk(KERN_ERR "valid_size=x%08x\n", hwdescr->valid_size);
+ printk(KERN_ERR "data_status=x%08x\n", hwdescr->data_status);
+ printk(KERN_ERR "data_error=x%08x\n", hwdescr->data_error);
+ printk(KERN_ERR "which=%ld\n", descr - card->rx_chain.ring);
card->spider_stats.rx_desc_error++;
goto bad_desc;
diff -puN drivers/net/spider_net.h~remove-current-defines-and-uses-of-pr_err-add-pr_emerg drivers/net/spider_net.h
--- a/drivers/net/spider_net.h~remove-current-defines-and-uses-of-pr_err-add-pr_emerg
+++ a/drivers/net/spider_net.h
@@ -493,7 +493,4 @@ struct spider_net_card {
struct spider_net_descr darray[0];
};
-#define pr_err(fmt,arg...) \
- printk(KERN_ERR fmt ,##arg)
-
#endif
diff -puN drivers/video/omap/lcd_h3.c~remove-current-defines-and-uses-of-pr_err-add-pr_emerg drivers/video/omap/lcd_h3.c
--- a/drivers/video/omap/lcd_h3.c~remove-current-defines-and-uses-of-pr_err-add-pr_emerg
+++ a/drivers/video/omap/lcd_h3.c
@@ -27,8 +27,7 @@
#include <asm/arch/omapfb.h>
#define MODULE_NAME "omapfb-lcd_h3"
-
-#define pr_err(fmt, args...) printk(KERN_ERR MODULE_NAME ": " fmt, ## args)
+#define PFX MODULE_NAME ": "
static int h3_panel_init(struct lcd_panel *panel, struct omapfb_device *fbdev)
{
@@ -48,7 +47,7 @@ static int h3_panel_enable(struct lcd_pa
if (!r)
r = tps65010_set_gpio_out_value(GPIO2, HIGH);
if (r)
- pr_err("Unable to turn on LCD panel\n");
+ printk(KERN_ERR PFX "Unable to turn on LCD panel\n");
return r;
}
@@ -62,7 +61,7 @@ static void h3_panel_disable(struct lcd_
if (!r)
tps65010_set_gpio_out_value(GPIO2, LOW);
if (r)
- pr_err("Unable to turn off LCD panel\n");
+ printk(KERN_ERR PFX "Unable to turn off LCD panel\n");
}
static unsigned long h3_panel_get_caps(struct lcd_panel *panel)
diff -puN drivers/video/omap/lcd_inn1610.c~remove-current-defines-and-uses-of-pr_err-add-pr_emerg drivers/video/omap/lcd_inn1610.c
--- a/drivers/video/omap/lcd_inn1610.c~remove-current-defines-and-uses-of-pr_err-add-pr_emerg
+++ a/drivers/video/omap/lcd_inn1610.c
@@ -26,8 +26,7 @@
#include <asm/arch/omapfb.h>
#define MODULE_NAME "omapfb-lcd_h3"
-
-#define pr_err(fmt, args...) printk(KERN_ERR MODULE_NAME ": " fmt, ## args)
+#define PFX MODULE_NAME ": "
static int innovator1610_panel_init(struct lcd_panel *panel,
struct omapfb_device *fbdev)
@@ -35,12 +34,12 @@ static int innovator1610_panel_init(stru
int r = 0;
if (omap_request_gpio(14)) {
- pr_err("can't request GPIO 14\n");
+ printk(KERN_ERR PFX "can't request GPIO 14\n");
r = -1;
goto exit;
}
if (omap_request_gpio(15)) {
- pr_err("can't request GPIO 15\n");
+ printk(KERN_ERR PFX "can't request GPIO 15\n");
omap_free_gpio(14);
r = -1;
goto exit;
diff -puN include/linux/kernel.h~remove-current-defines-and-uses-of-pr_err-add-pr_emerg include/linux/kernel.h
--- a/include/linux/kernel.h~remove-current-defines-and-uses-of-pr_err-add-pr_emerg
+++ a/include/linux/kernel.h
@@ -241,20 +241,24 @@ extern void print_hex_dump_bytes(const c
void *buf, size_t len);
#define hex_asc(x) "0123456789abcdef"[x]
+#define pr_emerg(fmt, arg...) printk(KERN_EMERG fmt, ##arg)
+#define pr_alert(fmt, arg...) printk(KERN_ALERT fmt, ##arg)
+#define pr_crit(fmt, arg...) printk(KERN_CRIT fmt, ##arg)
+#define pr_err(fmt, arg...) printk(KERN_ERR fmt, ##arg)
+#define pr_warn(fmt, arg...) printk(KERN_WARNING fmt, ##arg)
+#define pr_notice(fmt, arg...) printk(KERN_NOTICE fmt, ##arg)
+#define pr_info(fmt, arg...) printk(KERN_INFO fmt, ##arg)
+
#ifdef DEBUG
/* If you are writing a driver, please use dev_dbg instead */
-#define pr_debug(fmt,arg...) \
- printk(KERN_DEBUG fmt,##arg)
+#define pr_debug(fmt,arg...) printk(KERN_DEBUG fmt, ##arg)
#else
-static inline int __attribute__ ((format (printf, 1, 2))) pr_debug(const char * fmt, ...)
+static inline int __attribute__ ((format (printf, 1, 2))) pr_debug(const char *fmt, ...)
{
return 0;
}
#endif
-#define pr_info(fmt,arg...) \
- printk(KERN_INFO fmt,##arg)
-
/*
* Display an IP address in readable format.
*/
_
Patches currently in -mm which might be from joe@xxxxxxxxxxx are
remove-current-defines-and-uses-of-pr_err-add-pr_emerg.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
