[PATCHv2] dvb: or51211: apply pr_fmt and use pr_* macros instead of printk

2012-12-18 Thread Andy Shevchenko 
Signed-off-by: Andy Shevchenko 
---
 drivers/media/dvb-frontends/or51211.c |   94 +++--
 1 file changed, 43 insertions(+), 51 deletions(-)

diff --git a/drivers/media/dvb-frontends/or51211.c 
b/drivers/media/dvb-frontends/or51211.c
index 1af997e..10cfc05 100644
--- a/drivers/media/dvb-frontends/or51211.c
+++ b/drivers/media/dvb-frontends/or51211.c
@@ -22,6 +22,8 @@
  *
 */
 
+#define pr_fmt(fmt)KBUILD_MODNAME ": %s: " fmt, __func__
+
 /*
  * This driver needs external firmware. Please use the command
  * "/Documentation/dvb/get_dvb_firmware or51211" to
@@ -44,9 +46,7 @@
 
 static int debug;
 #define dprintk(args...) \
-   do { \
-   if (debug) printk(KERN_DEBUG "or51211: " args); \
-   } while (0)
+   do { if (debug) pr_debug(args); } while (0)
 
 static u8 run_buf[] = {0x7f,0x01};
 static u8 cmd_buf[] = {0x04,0x01,0x50,0x80,0x06}; // ATSC
@@ -80,8 +80,7 @@ static int i2c_writebytes (struct or51211_state* state, u8 
reg, const u8 *buf,
msg.buf = (u8 *)buf;
 
if ((err = i2c_transfer (state->i2c, &msg, 1)) != 1) {
-   printk(KERN_WARNING "or51211: i2c_writebytes error "
-  "(addr %02x, err == %i)\n", reg, err);
+   pr_warn("error (addr %02x, err == %i)\n", reg, err);
return -EREMOTEIO;
}
 
@@ -98,8 +97,7 @@ static int i2c_readbytes(struct or51211_state *state, u8 reg, 
u8 *buf, int len)
msg.buf = buf;
 
if ((err = i2c_transfer (state->i2c, &msg, 1)) != 1) {
-   printk(KERN_WARNING "or51211: i2c_readbytes error "
-  "(addr %02x, err == %i)\n", reg, err);
+   pr_warn("error (addr %02x, err == %i)\n", reg, err);
return -EREMOTEIO;
}
 
@@ -118,11 +116,11 @@ static int or51211_load_firmware (struct dvb_frontend* fe,
/* Get eprom data */
tudata[0] = 17;
if (i2c_writebytes(state,0x50,tudata,1)) {
-   printk(KERN_WARNING "or51211:load_firmware error eprom addr\n");
+   pr_warn("error eprom addr\n");
return -1;
}
if (i2c_readbytes(state,0x50,&tudata[145],192)) {
-   printk(KERN_WARNING "or51211: load_firmware error eprom\n");
+   pr_warn("error eprom\n");
return -1;
}
 
@@ -136,32 +134,32 @@ static int or51211_load_firmware (struct dvb_frontend* fe,
state->config->reset(fe);
 
if (i2c_writebytes(state,state->config->demod_address,tudata,585)) {
-   printk(KERN_WARNING "or51211: load_firmware error 1\n");
+   pr_warn("error 1\n");
return -1;
}
msleep(1);
 
if (i2c_writebytes(state,state->config->demod_address,
   &fw->data[393],8125)) {
-   printk(KERN_WARNING "or51211: load_firmware error 2\n");
+   pr_warn("error 2\n");
return -1;
}
msleep(1);
 
if (i2c_writebytes(state,state->config->demod_address,run_buf,2)) {
-   printk(KERN_WARNING "or51211: load_firmware error 3\n");
+   pr_warn("error 3\n");
return -1;
}
 
/* Wait at least 5 msec */
msleep(10);
if (i2c_writebytes(state,state->config->demod_address,run_buf,2)) {
-   printk(KERN_WARNING "or51211: load_firmware error 4\n");
+   pr_warn("error 4\n");
return -1;
}
msleep(10);
 
-   printk("or51211: Done.\n");
+   pr_info("Done.\n");
return 0;
 };
 
@@ -173,14 +171,14 @@ static int or51211_setmode(struct dvb_frontend* fe, int 
mode)
state->config->setmode(fe, mode);
 
if (i2c_writebytes(state,state->config->demod_address,run_buf,2)) {
-   printk(KERN_WARNING "or51211: setmode error 1\n");
+   pr_warn("error 1\n");
return -1;
}
 
/* Wait at least 5 msec */
msleep(10);
if (i2c_writebytes(state,state->config->demod_address,run_buf,2)) {
-   printk(KERN_WARNING "or51211: setmode error 2\n");
+   pr_warn("error 2\n");
return -1;
}
 
@@ -196,7 +194,7 @@ static int or51211_setmode(struct dvb_frontend* fe, int 
mode)
 * normal +/-150kHz Carrier acquisition range
 */
if (i2c_writebytes(state,state->config->demod_address,cmd_buf,3)) {
-   printk(KERN_WARNING "or51211: setmode error 3\n");
+   pr_warn("error 3\n");
return -1;
}
 
@@ -206,14 +204,14 @@ static int or51211_setmode(struct dvb_frontend* fe, int 
mode)
rec_buf[3] = 0x00;
msleep(20);
if (i2c_writebytes(state,state->config->demod_address,rec_buf,3)) {
-   printk(KERN_WARNING "or51211: setmode error 5\n");
+   pr_warn("error 5\n");
}
msleep(3);
if (i2c_readbytes(sta

dvb: or51211: apply pr_fmt and use pr_* macros instead of printk

2012-12-17 Thread Michael Krufky 
Andy,

Your patch from Nov 28 entitled, "dvb: or51211: apply pr_fmt and use
pr_* macros instead of printk" located in patchwork at the URL:

http://patchwork.linuxtv.org/patch/15688/

...creates the following build warning:

  CC [M]  drivers/media/dvb-frontends/or51211.o
drivers/media/dvb-frontends/or51211.c:45:0: warning: "pr_fmt"
redefined [enabled by default]
In file included from include/linux/kernel.h:13:0,
 from drivers/media/dvb-frontends/or51211.c:33:
include/linux/printk.h:180:0: note: this is the location of the
previous definition
drivers/media/dvb-frontends/or51211.c:45:0: warning: "pr_fmt"
redefined [enabled by default]
In file included from include/linux/kernel.h:13:0,
 from drivers/media/dvb-frontends/or51211.c:33:
include/linux/printk.h:180:0: note: this is the location of the
previous definition

Please take a look at your patch and send a revised version if you
think it's appropriate.

I will have the other "use %*ph[N] to dump small buffers" patches
merged -- thanks for your contribution!

Regards,

Mike Krufky
--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PATCH 2/2] dvb: or51211: apply pr_fmt and use pr_* macros instead of printk

2012-11-28 Thread Andy Shevchenko 
Signed-off-by: Andy Shevchenko 
---
 drivers/media/dvb-frontends/or51211.c |   94 +++--
 1 file changed, 43 insertions(+), 51 deletions(-)

diff --git a/drivers/media/dvb-frontends/or51211.c 
b/drivers/media/dvb-frontends/or51211.c
index 1af997e..9db8008 100644
--- a/drivers/media/dvb-frontends/or51211.c
+++ b/drivers/media/dvb-frontends/or51211.c
@@ -42,11 +42,11 @@
 #include "dvb_frontend.h"
 #include "or51211.h"
 
+#define pr_fmt(fmt)KBUILD_MODNAME ": %s: " fmt, __func__
+
 static int debug;
 #define dprintk(args...) \
-   do { \
-   if (debug) printk(KERN_DEBUG "or51211: " args); \
-   } while (0)
+   do { if (debug) pr_debug(args); } while (0)
 
 static u8 run_buf[] = {0x7f,0x01};
 static u8 cmd_buf[] = {0x04,0x01,0x50,0x80,0x06}; // ATSC
@@ -80,8 +80,7 @@ static int i2c_writebytes (struct or51211_state* state, u8 
reg, const u8 *buf,
msg.buf = (u8 *)buf;
 
if ((err = i2c_transfer (state->i2c, &msg, 1)) != 1) {
-   printk(KERN_WARNING "or51211: i2c_writebytes error "
-  "(addr %02x, err == %i)\n", reg, err);
+   pr_warn("error (addr %02x, err == %i)\n", reg, err);
return -EREMOTEIO;
}
 
@@ -98,8 +97,7 @@ static int i2c_readbytes(struct or51211_state *state, u8 reg, 
u8 *buf, int len)
msg.buf = buf;
 
if ((err = i2c_transfer (state->i2c, &msg, 1)) != 1) {
-   printk(KERN_WARNING "or51211: i2c_readbytes error "
-  "(addr %02x, err == %i)\n", reg, err);
+   pr_warn("error (addr %02x, err == %i)\n", reg, err);
return -EREMOTEIO;
}
 
@@ -118,11 +116,11 @@ static int or51211_load_firmware (struct dvb_frontend* fe,
/* Get eprom data */
tudata[0] = 17;
if (i2c_writebytes(state,0x50,tudata,1)) {
-   printk(KERN_WARNING "or51211:load_firmware error eprom addr\n");
+   pr_warn("error eprom addr\n");
return -1;
}
if (i2c_readbytes(state,0x50,&tudata[145],192)) {
-   printk(KERN_WARNING "or51211: load_firmware error eprom\n");
+   pr_warn("error eprom\n");
return -1;
}
 
@@ -136,32 +134,32 @@ static int or51211_load_firmware (struct dvb_frontend* fe,
state->config->reset(fe);
 
if (i2c_writebytes(state,state->config->demod_address,tudata,585)) {
-   printk(KERN_WARNING "or51211: load_firmware error 1\n");
+   pr_warn("error 1\n");
return -1;
}
msleep(1);
 
if (i2c_writebytes(state,state->config->demod_address,
   &fw->data[393],8125)) {
-   printk(KERN_WARNING "or51211: load_firmware error 2\n");
+   pr_warn("error 2\n");
return -1;
}
msleep(1);
 
if (i2c_writebytes(state,state->config->demod_address,run_buf,2)) {
-   printk(KERN_WARNING "or51211: load_firmware error 3\n");
+   pr_warn("error 3\n");
return -1;
}
 
/* Wait at least 5 msec */
msleep(10);
if (i2c_writebytes(state,state->config->demod_address,run_buf,2)) {
-   printk(KERN_WARNING "or51211: load_firmware error 4\n");
+   pr_warn("error 4\n");
return -1;
}
msleep(10);
 
-   printk("or51211: Done.\n");
+   pr_info("Done.\n");
return 0;
 };
 
@@ -173,14 +171,14 @@ static int or51211_setmode(struct dvb_frontend* fe, int 
mode)
state->config->setmode(fe, mode);
 
if (i2c_writebytes(state,state->config->demod_address,run_buf,2)) {
-   printk(KERN_WARNING "or51211: setmode error 1\n");
+   pr_warn("error 1\n");
return -1;
}
 
/* Wait at least 5 msec */
msleep(10);
if (i2c_writebytes(state,state->config->demod_address,run_buf,2)) {
-   printk(KERN_WARNING "or51211: setmode error 2\n");
+   pr_warn("error 2\n");
return -1;
}
 
@@ -196,7 +194,7 @@ static int or51211_setmode(struct dvb_frontend* fe, int 
mode)
 * normal +/-150kHz Carrier acquisition range
 */
if (i2c_writebytes(state,state->config->demod_address,cmd_buf,3)) {
-   printk(KERN_WARNING "or51211: setmode error 3\n");
+   pr_warn("error 3\n");
return -1;
}
 
@@ -206,14 +204,14 @@ static int or51211_setmode(struct dvb_frontend* fe, int 
mode)
rec_buf[3] = 0x00;
msleep(20);
if (i2c_writebytes(state,state->config->demod_address,rec_buf,3)) {
-   printk(KERN_WARNING "or51211: setmode error 5\n");
+   pr_warn("error 5\n");
}
msleep(3);
if (i2c_readbytes(state,state->config->demod_address,&rec_buf[10],2)) {
-   printk(KERN_WARNING "or51211: s

[PATCH 2/2] dvb: or51211: apply pr_fmt and use pr_* macros instead of printk

2012-10-26 Thread Andy Shevchenko 
Signed-off-by: Andy Shevchenko 
---
 drivers/media/dvb-frontends/or51211.c |   94 +++--
 1 file changed, 43 insertions(+), 51 deletions(-)

diff --git a/drivers/media/dvb-frontends/or51211.c 
b/drivers/media/dvb-frontends/or51211.c
index 1af997e..9db8008 100644
--- a/drivers/media/dvb-frontends/or51211.c
+++ b/drivers/media/dvb-frontends/or51211.c
@@ -42,11 +42,11 @@
 #include "dvb_frontend.h"
 #include "or51211.h"
 
+#define pr_fmt(fmt)KBUILD_MODNAME ": %s: " fmt, __func__
+
 static int debug;
 #define dprintk(args...) \
-   do { \
-   if (debug) printk(KERN_DEBUG "or51211: " args); \
-   } while (0)
+   do { if (debug) pr_debug(args); } while (0)
 
 static u8 run_buf[] = {0x7f,0x01};
 static u8 cmd_buf[] = {0x04,0x01,0x50,0x80,0x06}; // ATSC
@@ -80,8 +80,7 @@ static int i2c_writebytes (struct or51211_state* state, u8 
reg, const u8 *buf,
msg.buf = (u8 *)buf;
 
if ((err = i2c_transfer (state->i2c, &msg, 1)) != 1) {
-   printk(KERN_WARNING "or51211: i2c_writebytes error "
-  "(addr %02x, err == %i)\n", reg, err);
+   pr_warn("error (addr %02x, err == %i)\n", reg, err);
return -EREMOTEIO;
}
 
@@ -98,8 +97,7 @@ static int i2c_readbytes(struct or51211_state *state, u8 reg, 
u8 *buf, int len)
msg.buf = buf;
 
if ((err = i2c_transfer (state->i2c, &msg, 1)) != 1) {
-   printk(KERN_WARNING "or51211: i2c_readbytes error "
-  "(addr %02x, err == %i)\n", reg, err);
+   pr_warn("error (addr %02x, err == %i)\n", reg, err);
return -EREMOTEIO;
}
 
@@ -118,11 +116,11 @@ static int or51211_load_firmware (struct dvb_frontend* fe,
/* Get eprom data */
tudata[0] = 17;
if (i2c_writebytes(state,0x50,tudata,1)) {
-   printk(KERN_WARNING "or51211:load_firmware error eprom addr\n");
+   pr_warn("error eprom addr\n");
return -1;
}
if (i2c_readbytes(state,0x50,&tudata[145],192)) {
-   printk(KERN_WARNING "or51211: load_firmware error eprom\n");
+   pr_warn("error eprom\n");
return -1;
}
 
@@ -136,32 +134,32 @@ static int or51211_load_firmware (struct dvb_frontend* fe,
state->config->reset(fe);
 
if (i2c_writebytes(state,state->config->demod_address,tudata,585)) {
-   printk(KERN_WARNING "or51211: load_firmware error 1\n");
+   pr_warn("error 1\n");
return -1;
}
msleep(1);
 
if (i2c_writebytes(state,state->config->demod_address,
   &fw->data[393],8125)) {
-   printk(KERN_WARNING "or51211: load_firmware error 2\n");
+   pr_warn("error 2\n");
return -1;
}
msleep(1);
 
if (i2c_writebytes(state,state->config->demod_address,run_buf,2)) {
-   printk(KERN_WARNING "or51211: load_firmware error 3\n");
+   pr_warn("error 3\n");
return -1;
}
 
/* Wait at least 5 msec */
msleep(10);
if (i2c_writebytes(state,state->config->demod_address,run_buf,2)) {
-   printk(KERN_WARNING "or51211: load_firmware error 4\n");
+   pr_warn("error 4\n");
return -1;
}
msleep(10);
 
-   printk("or51211: Done.\n");
+   pr_info("Done.\n");
return 0;
 };
 
@@ -173,14 +171,14 @@ static int or51211_setmode(struct dvb_frontend* fe, int 
mode)
state->config->setmode(fe, mode);
 
if (i2c_writebytes(state,state->config->demod_address,run_buf,2)) {
-   printk(KERN_WARNING "or51211: setmode error 1\n");
+   pr_warn("error 1\n");
return -1;
}
 
/* Wait at least 5 msec */
msleep(10);
if (i2c_writebytes(state,state->config->demod_address,run_buf,2)) {
-   printk(KERN_WARNING "or51211: setmode error 2\n");
+   pr_warn("error 2\n");
return -1;
}
 
@@ -196,7 +194,7 @@ static int or51211_setmode(struct dvb_frontend* fe, int 
mode)
 * normal +/-150kHz Carrier acquisition range
 */
if (i2c_writebytes(state,state->config->demod_address,cmd_buf,3)) {
-   printk(KERN_WARNING "or51211: setmode error 3\n");
+   pr_warn("error 3\n");
return -1;
}
 
@@ -206,14 +204,14 @@ static int or51211_setmode(struct dvb_frontend* fe, int 
mode)
rec_buf[3] = 0x00;
msleep(20);
if (i2c_writebytes(state,state->config->demod_address,rec_buf,3)) {
-   printk(KERN_WARNING "or51211: setmode error 5\n");
+   pr_warn("error 5\n");
}
msleep(3);
if (i2c_readbytes(state,state->config->demod_address,&rec_buf[10],2)) {
-   printk(KERN_WARNING "or51211: s