[PATCH] [POWERPC] ucc_geth: Eliminate compile warnings

2007-10-18 Thread Emil Medve 
drivers/net/ucc_geth.c: In function 'ucc_geth_startup':
drivers/net/ucc_geth.c:2614: warning: assignment makes integer from pointer 
without a cast
drivers/net/ucc_geth.c:2651: warning: assignment makes integer from pointer 
without a cast

Signed-off-by: Emil Medve [EMAIL PROTECTED]
---

This patch is against Jeff's tree: d85714d81cc0408daddb68c10f7fd69eafe7c213 

netdev-2.6 scripts/checkpatch.pl 
0001-POWERPC-ucc_geth-Eliminate-compile-warnings.patch 
Your patch has no obvious style problems and is ready for submission.

 drivers/net/ucc_geth.c |4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/net/ucc_geth.c b/drivers/net/ucc_geth.c
index bec413b..d427da8 100644
--- a/drivers/net/ucc_geth.c
+++ b/drivers/net/ucc_geth.c
@@ -2611,7 +2611,7 @@ static int ucc_geth_startup(struct ucc_geth_private 
*ugeth)
if (UCC_GETH_TX_BD_RING_ALIGNMENT  4)
align = UCC_GETH_TX_BD_RING_ALIGNMENT;
ugeth-tx_bd_ring_offset[j] =
-   kmalloc((u32) (length + align), GFP_KERNEL);
+   (u32)kmalloc(length + align, GFP_KERNEL);
 
if (ugeth-tx_bd_ring_offset[j] != 0)
ugeth-p_tx_bd_ring[j] =
@@ -2648,7 +2648,7 @@ static int ucc_geth_startup(struct ucc_geth_private 
*ugeth)
if (UCC_GETH_RX_BD_RING_ALIGNMENT  4)
align = UCC_GETH_RX_BD_RING_ALIGNMENT;
ugeth-rx_bd_ring_offset[j] =
-   kmalloc((u32) (length + align), GFP_KERNEL);
+   (u32)kmalloc(length + align, GFP_KERNEL);
if (ugeth-rx_bd_ring_offset[j] != 0)
ugeth-p_rx_bd_ring[j] =
(void*)((ugeth-rx_bd_ring_offset[j] +
-- 
1.5.3.GIT

-
To unsubscribe from this list: send the line unsubscribe netdev in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PATCH v2] [POWERPC] ucc_geth: Fix build break introduced by commit 09f75cd7bf13720738e6a196cc0107ce9a5bd5a0

2007-10-15 Thread Emil Medve 
drivers/net/ucc_geth.c: In function 'ucc_geth_rx':
drivers/net/ucc_geth.c:3483: error: 'dev' undeclared (first use in this 
function)
drivers/net/ucc_geth.c:3483: error: (Each undeclared identifier is reported 
only once
drivers/net/ucc_geth.c:3483: error: for each function it appears in.)
make[2]: *** [drivers/net/ucc_geth.o] Error 1

Signed-off-by: Emil Medve [EMAIL PROTECTED]
---

Here is a convenient link for the culprit patch: 
http://git.kernel.org/?p=linux/kernel/git/jgarzik/netdev-2.6.git;a=commit;h=09f75cd7bf13720738e6a196cc0107ce9a5bd5a0

netdev-2.6 scripts/checkpatch.pl 
0001-POWERPC-ucc_geth-Fix-build-break-introduced-by-co.patch 
Your patch has no obvious style problems and is ready for submission.

 drivers/net/ucc_geth.c |5 -
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/drivers/net/ucc_geth.c b/drivers/net/ucc_geth.c
index d00e7d4..bec413b 100644
--- a/drivers/net/ucc_geth.c
+++ b/drivers/net/ucc_geth.c
@@ -63,7 +63,7 @@
 #define UGETH_MSG_DEFAULT  (NETIF_MSG_IFUP  1 ) - 1
 
 void uec_set_ethtool_ops(struct net_device *netdev);
-   
+
 static DEFINE_SPINLOCK(ugeth_lock);
 
 static struct {
@@ -3454,9 +3454,12 @@ static int ucc_geth_rx(struct ucc_geth_private *ugeth, 
u8 rxQ, int rx_work_limit
u16 length, howmany = 0;
u32 bd_status;
u8 *bdBuffer;
+   struct net_device * dev;
 
ugeth_vdbg(%s: IN, __FUNCTION__);
 
+   dev = ugeth-dev;
+
/* collect received buffers */
bd = ugeth-rxBd[rxQ];
 
-- 
1.5.3.GIT
-
To unsubscribe from this list: send the line unsubscribe netdev in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PATCH] [POWERPC] ucc_geth: Fix build break introduced by commit 09f75cd7bf13720738e6a196cc0107ce9a5bd5a0

2007-10-12 Thread Emil Medve 
  CC  drivers/net/ucc_geth.o
drivers/net/ucc_geth.c: In function 'ucc_geth_startup':
drivers/net/ucc_geth.c:2614: warning: assignment makes integer from pointer 
without a cast
drivers/net/ucc_geth.c:2651: warning: assignment makes integer from pointer 
without a cast
drivers/net/ucc_geth.c: In function 'ucc_geth_rx':
drivers/net/ucc_geth.c:3483: error: 'dev' undeclared (first use in this 
function)
drivers/net/ucc_geth.c:3483: error: (Each undeclared identifier is reported 
only once
drivers/net/ucc_geth.c:3483: error: for each function it appears in.)
make[2]: *** [drivers/net/ucc_geth.o] Error 1

Signed-off-by: Emil Medve [EMAIL PROTECTED]
---

Here is a convenient link for the culprit patch: 
http://git.kernel.org/?p=linux/kernel/git/jgarzik/netdev-2.6.git;a=commit;h=09f75cd7bf13720738e6a196cc0107ce9a5bd5a0

netdev-2.6 scripts/checkpatch.pl 
0001-POWERPC-ucc_geth-Fix-build-break-introduced-by-co.patch 
Your patch has no obvious style problems and is ready for submission.

 drivers/net/ucc_geth.c |   10 +-
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/drivers/net/ucc_geth.c b/drivers/net/ucc_geth.c
index d00e7d4..c43d4d1 100644
--- a/drivers/net/ucc_geth.c
+++ b/drivers/net/ucc_geth.c
@@ -63,7 +63,7 @@
 #define UGETH_MSG_DEFAULT  (NETIF_MSG_IFUP  1 ) - 1
 
 void uec_set_ethtool_ops(struct net_device *netdev);
-   
+
 static DEFINE_SPINLOCK(ugeth_lock);
 
 static struct {
@@ -3480,9 +3480,9 @@ static int ucc_geth_rx(struct ucc_geth_private *ugeth, u8 
rxQ, int rx_work_limit
dev_kfree_skb_any(skb);
 
ugeth-rx_skbuff[rxQ][ugeth-skb_currx[rxQ]] = NULL;
-   dev-stats.rx_dropped++;
+   ugeth-dev-stats.rx_dropped++;
} else {
-   dev-stats.rx_packets++;
+   ugeth-dev-stats.rx_packets++;
howmany++;
 
/* Prep the skb for the packet */
@@ -3491,7 +3491,7 @@ static int ucc_geth_rx(struct ucc_geth_private *ugeth, u8 
rxQ, int rx_work_limit
/* Tell the skb what kind of packet this is */
skb-protocol = eth_type_trans(skb, ugeth-dev);
 
-   dev-stats.rx_bytes += length;
+   ugeth-dev-stats.rx_bytes += length;
/* Send the packet up the stack */
 #ifdef CONFIG_UGETH_NAPI
netif_receive_skb(skb);
@@ -3506,7 +3506,7 @@ static int ucc_geth_rx(struct ucc_geth_private *ugeth, u8 
rxQ, int rx_work_limit
if (!skb) {
if (netif_msg_rx_err(ugeth))
ugeth_warn(%s: No Rx Data Buffer, 
__FUNCTION__);
-   dev-stats.rx_dropped++;
+   ugeth-dev-stats.rx_dropped++;
break;
}
 
-- 
1.5.3.GIT

-
To unsubscribe from this list: send the line unsubscribe netdev in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PATCH v3] Make the pr_*() family of macros in kernel.h complete

2007-09-12 Thread Emil Medve 
Other/Some pr_*() macros are already defined in kernel.h, but pr_err() was 
defined
multiple times in several other places

Signed-off-by: Emil Medve [EMAIL PROTECTED]
---

I'm writing a driver and I've been using the pr_*() macros from kernel.h and I
was surprised not to find there pr_err() but defined multiple times (in four
different files). I didn't want to define it yet one more time so I did this
cleanup

As per community request/suggestion, I added the rest of the missing pr_*()
macros to complete the family. The names of the macros are based on the KERN_*
loglevel names and are macthing the naming convention of the dev_*() print
macros from device.h. The macros are defined in the ascending order of the
loglevel

This patch is against Linus' tree (577107e8e4cf9f6f4f5ef8350ac9a8faa6c3796d)

linux-2.6 scripts/checkpatch.pl 
0001-Make-the-pr_-family-of-macros-in-kernel.h-complet.patch 
Your patch has no obvious style problems and is ready for submission.

 drivers/i2c/chips/menelaus.c |   10 --
 drivers/net/spider_net.h |3 ---
 drivers/video/omap/lcd_h3.c  |6 ++
 drivers/video/omap/lcd_inn1610.c |6 ++
 include/linux/kernel.h   |   22 +-
 5 files changed, 25 insertions(+), 22 deletions(-)

diff --git a/drivers/i2c/chips/menelaus.c b/drivers/i2c/chips/menelaus.c
index d9c92c5..66436ba 100644
--- a/drivers/i2c/chips/menelaus.c
+++ b/drivers/i2c/chips/menelaus.c
@@ -49,8 +49,6 @@
 
 #define DRIVER_NAMEmenelaus
 
-#define pr_err(fmt, arg...)printk(KERN_ERR DRIVER_NAME : , ## arg);
-
 #define MENELAUS_I2C_ADDRESS   0x72
 
 #define MENELAUS_REV   0x01
@@ -155,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);
+   pr_err(DRIVER_NAME : write error);
return val;
}
 
@@ -167,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);
+   pr_err(DRIVER_NAME : read error);
 
return val;
 }
@@ -1177,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);
+   pr_err(DRIVER_NAME : device not found);
err = -ENODEV;
goto fail1;
}
@@ -1258,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);
+   pr_err(DRIVER_NAME : driver registration failed\n);
return res;
}
 
diff --git a/drivers/net/spider_net.h b/drivers/net/spider_net.h
index dbbdb8c..c67b11d 100644
--- a/drivers/net/spider_net.h
+++ b/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 --git a/drivers/video/omap/lcd_h3.c b/drivers/video/omap/lcd_h3.c
index 51807b4..c604d93 100644
--- a/drivers/video/omap/lcd_h3.c
+++ b/drivers/video/omap/lcd_h3.c
@@ -28,8 +28,6 @@
 
 #define MODULE_NAMEomapfb-lcd_h3
 
-#define pr_err(fmt, args...) printk(KERN_ERR MODULE_NAME :  fmt, ## args)
-
 static int h3_panel_init(struct lcd_panel *panel, struct omapfb_device *fbdev)
 {
return 0;
@@ -48,7 +46,7 @@ static int h3_panel_enable(struct lcd_panel *panel)
if (!r)
r = tps65010_set_gpio_out_value(GPIO2, HIGH);
if (r)
-   pr_err(Unable to turn on LCD panel\n);
+   pr_err(MODULE_NAME : Unable to turn on LCD panel\n);
 
return r;
 }
@@ -62,7 +60,7 @@ static void h3_panel_disable(struct lcd_panel *panel)
if (!r)
tps65010_set_gpio_out_value(GPIO2, LOW);
if (r)
-   pr_err(Unable to turn off LCD panel\n);
+   pr_err(MODULE_NAME : Unable to turn off LCD panel\n);
 }
 
 static unsigned long h3_panel_get_caps(struct lcd_panel *panel)
diff --git a/drivers/video/omap/lcd_inn1610.c b/drivers/video/omap/lcd_inn1610.c
index 95604ca..5ef119c 100644
--- a/drivers/video/omap/lcd_inn1610.c
+++ b/drivers/video/omap/lcd_inn1610.c
@@ -27,20 +27,18 @@
 
 #define MODULE_NAMEomapfb-lcd_h3
 
-#define pr_err(fmt, args...) printk(KERN_ERR MODULE_NAME :  fmt, ## args)
-
 static int innovator1610_panel_init(struct lcd_panel *panel,
struct omapfb_device *fbdev)
 {
int r = 0;
 
if (omap_request_gpio(14)) {
-   pr_err(can't request GPIO 14\n);
+   pr_err(MODULE_NAME : can't request GPIO 14\n);
r = -1;
goto exit

[PATCH] Move the definition of pr_err() into kernel.h

2007-09-11 Thread Emil Medve 
Other pr_*() macros are already defined in kernel.h, but pr_err() was defined
multiple times in several other places

Signed-off-by: Emil Medve [EMAIL PROTECTED]
---
 drivers/i2c/chips/menelaus.c |   10 --
 drivers/net/spider_net.h |3 ---
 drivers/video/omap/lcd_h3.c  |6 ++
 drivers/video/omap/lcd_inn1610.c |6 ++
 include/linux/kernel.h   |2 ++
 5 files changed, 10 insertions(+), 17 deletions(-)

diff --git a/drivers/i2c/chips/menelaus.c b/drivers/i2c/chips/menelaus.c
index d9c92c5..fc5eed4 100644
--- a/drivers/i2c/chips/menelaus.c
+++ b/drivers/i2c/chips/menelaus.c
@@ -49,8 +49,6 @@
 
 #define DRIVER_NAMEmenelaus
 
-#define pr_err(fmt, arg...)printk(KERN_ERR DRIVER_NAME : , ## arg);
-
 #define MENELAUS_I2C_ADDRESS   0x72
 
 #define MENELAUS_REV   0x01
@@ -155,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);
+   pr_err(DRIVER_NAME :write error);
return val;
}
 
@@ -167,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);
+   pr_err(DRIVER_NAME :read error);
 
return val;
 }
@@ -1177,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);
+   pr_err(DRIVER_NAME :device not found);
err = -ENODEV;
goto fail1;
}
@@ -1258,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);
+   pr_err(DRIVER_NAME :driver registration failed\n);
return res;
}
 
diff --git a/drivers/net/spider_net.h b/drivers/net/spider_net.h
index dbbdb8c..c67b11d 100644
--- a/drivers/net/spider_net.h
+++ b/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 --git a/drivers/video/omap/lcd_h3.c b/drivers/video/omap/lcd_h3.c
index 51807b4..c81271d 100644
--- a/drivers/video/omap/lcd_h3.c
+++ b/drivers/video/omap/lcd_h3.c
@@ -28,8 +28,6 @@
 
 #define MODULE_NAMEomapfb-lcd_h3
 
-#define pr_err(fmt, args...) printk(KERN_ERR MODULE_NAME :  fmt, ## args)
-
 static int h3_panel_init(struct lcd_panel *panel, struct omapfb_device *fbdev)
 {
return 0;
@@ -48,7 +46,7 @@ static int h3_panel_enable(struct lcd_panel *panel)
if (!r)
r = tps65010_set_gpio_out_value(GPIO2, HIGH);
if (r)
-   pr_err(Unable to turn on LCD panel\n);
+   pr_err(MODULE_NAME :Unable to turn on LCD panel\n);
 
return r;
 }
@@ -62,7 +60,7 @@ static void h3_panel_disable(struct lcd_panel *panel)
if (!r)
tps65010_set_gpio_out_value(GPIO2, LOW);
if (r)
-   pr_err(Unable to turn off LCD panel\n);
+   pr_err(MODULE_NAME :Unable to turn off LCD panel\n);
 }
 
 static unsigned long h3_panel_get_caps(struct lcd_panel *panel)
diff --git a/drivers/video/omap/lcd_inn1610.c b/drivers/video/omap/lcd_inn1610.c
index 95604ca..ea85cb9 100644
--- a/drivers/video/omap/lcd_inn1610.c
+++ b/drivers/video/omap/lcd_inn1610.c
@@ -27,20 +27,18 @@
 
 #define MODULE_NAMEomapfb-lcd_h3
 
-#define pr_err(fmt, args...) printk(KERN_ERR MODULE_NAME :  fmt, ## args)
-
 static int innovator1610_panel_init(struct lcd_panel *panel,
struct omapfb_device *fbdev)
 {
int r = 0;
 
if (omap_request_gpio(14)) {
-   pr_err(can't request GPIO 14\n);
+   pr_err(MODULE_NAME :can't request GPIO 14\n);
r = -1;
goto exit;
}
if (omap_request_gpio(15)) {
-   pr_err(can't request GPIO 15\n);
+   pr_err(MODULE_NAME :can't request GPIO 15\n);
omap_free_gpio(14);
r = -1;
goto exit;
diff --git a/include/linux/kernel.h b/include/linux/kernel.h
index f592df7..c51936a 100644
--- a/include/linux/kernel.h
+++ b/include/linux/kernel.h
@@ -242,6 +242,8 @@ static inline int __attribute__ ((format (printf, 1, 2))) 
pr_debug(const char *
 
 #define pr_info(fmt,arg...) \
printk(KERN_INFO fmt,##arg)
+#define pr_err(fmt, arg...) \
+   printk(KERN_ERR fmt, ##arg)
 
 /*
  *  Display an IP address in readable format.
-- 
1.5.3.GIT

-
To unsubscribe from this list: send the line unsubscribe netdev in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http

[PATCH v2] Move the definition of pr_err() into kernel.h

2007-09-11 Thread Emil Medve 
Other pr_*() macros are already defined in kernel.h, but pr_err() was defined
multiple times in several other places

Signed-off-by: Emil Medve [EMAIL PROTECTED]
---

I'm writing a driver and I've been using the pr_*() macros from kernel.h and I
was surprised not to find there pr_err() but defined multiple times (in four
different files). I didn't want to define it yet one more time so I did this
cleanup

This patch is against Linus' tree v2.6.23-rc6 
(0d4cbb5e7f60b2f1a4d8b7f6ea4cc264262c7a01)

linux-2.6 scripts/checkpatch.pl 
0001-Move-the-definition-of-pr_err-into-kernel.h.patch
Your patch has no obvious style problems and is ready for submission.

 drivers/i2c/chips/menelaus.c |   10 --
 drivers/net/spider_net.h |3 ---
 drivers/video/omap/lcd_h3.c  |6 ++
 drivers/video/omap/lcd_inn1610.c |6 ++
 include/linux/kernel.h   |2 ++
 5 files changed, 10 insertions(+), 17 deletions(-)

diff --git a/drivers/i2c/chips/menelaus.c b/drivers/i2c/chips/menelaus.c
index d9c92c5..66436ba 100644
--- a/drivers/i2c/chips/menelaus.c
+++ b/drivers/i2c/chips/menelaus.c
@@ -49,8 +49,6 @@
 
 #define DRIVER_NAMEmenelaus
 
-#define pr_err(fmt, arg...)printk(KERN_ERR DRIVER_NAME : , ## arg);
-
 #define MENELAUS_I2C_ADDRESS   0x72
 
 #define MENELAUS_REV   0x01
@@ -155,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);
+   pr_err(DRIVER_NAME : write error);
return val;
}
 
@@ -167,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);
+   pr_err(DRIVER_NAME : read error);
 
return val;
 }
@@ -1177,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);
+   pr_err(DRIVER_NAME : device not found);
err = -ENODEV;
goto fail1;
}
@@ -1258,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);
+   pr_err(DRIVER_NAME : driver registration failed\n);
return res;
}
 
diff --git a/drivers/net/spider_net.h b/drivers/net/spider_net.h
index dbbdb8c..c67b11d 100644
--- a/drivers/net/spider_net.h
+++ b/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 --git a/drivers/video/omap/lcd_h3.c b/drivers/video/omap/lcd_h3.c
index 51807b4..c604d93 100644
--- a/drivers/video/omap/lcd_h3.c
+++ b/drivers/video/omap/lcd_h3.c
@@ -28,8 +28,6 @@
 
 #define MODULE_NAMEomapfb-lcd_h3
 
-#define pr_err(fmt, args...) printk(KERN_ERR MODULE_NAME :  fmt, ## args)
-
 static int h3_panel_init(struct lcd_panel *panel, struct omapfb_device *fbdev)
 {
return 0;
@@ -48,7 +46,7 @@ static int h3_panel_enable(struct lcd_panel *panel)
if (!r)
r = tps65010_set_gpio_out_value(GPIO2, HIGH);
if (r)
-   pr_err(Unable to turn on LCD panel\n);
+   pr_err(MODULE_NAME : Unable to turn on LCD panel\n);
 
return r;
 }
@@ -62,7 +60,7 @@ static void h3_panel_disable(struct lcd_panel *panel)
if (!r)
tps65010_set_gpio_out_value(GPIO2, LOW);
if (r)
-   pr_err(Unable to turn off LCD panel\n);
+   pr_err(MODULE_NAME : Unable to turn off LCD panel\n);
 }
 
 static unsigned long h3_panel_get_caps(struct lcd_panel *panel)
diff --git a/drivers/video/omap/lcd_inn1610.c b/drivers/video/omap/lcd_inn1610.c
index 95604ca..5ef119c 100644
--- a/drivers/video/omap/lcd_inn1610.c
+++ b/drivers/video/omap/lcd_inn1610.c
@@ -27,20 +27,18 @@
 
 #define MODULE_NAMEomapfb-lcd_h3
 
-#define pr_err(fmt, args...) printk(KERN_ERR MODULE_NAME :  fmt, ## args)
-
 static int innovator1610_panel_init(struct lcd_panel *panel,
struct omapfb_device *fbdev)
 {
int r = 0;
 
if (omap_request_gpio(14)) {
-   pr_err(can't request GPIO 14\n);
+   pr_err(MODULE_NAME : can't request GPIO 14\n);
r = -1;
goto exit;
}
if (omap_request_gpio(15)) {
-   pr_err(can't request GPIO 15\n);
+   pr_err(MODULE_NAME : can't request GPIO 15\n);
omap_free_gpio(14);
r = -1;
goto exit;
diff --git a/include/linux/kernel.h b/include/linux/kernel.h
index f592df7..c51936a 100644