diff options
| author | Joe Perches <joe@perches.com> | 2010-11-07 17:48:21 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2010-12-29 08:16:46 -0200 |
| commit | 36d89f7de4a4937848de86d9b35cb03a9f0357e1 (patch) | |
| tree | 38d40406de7fe081febb1f6394f308a6037c0c67 /drivers/staging/cx25821/cx25821-i2c.c | |
| parent | 13d28e4917fb6cf6898e8998f01ab83b3f468aeb (diff) | |
[media] drivers/staging/cx25821: Use pr_fmt and pr_<level>
Fix several defects with bad line continuation uses that
introduce whitespace.
Fix several defects with lines missing "\n".
Standardize prefixes via pr_fmt.
Remove internal cx25821 prefixes.
Standardize :%s():" ... __func__ uses.
Coalesce long formats.
Add KERN_<level> prefixes via pr_<level> to printks.
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/staging/cx25821/cx25821-i2c.c')
| -rw-r--r-- | drivers/staging/cx25821/cx25821-i2c.c | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/drivers/staging/cx25821/cx25821-i2c.c b/drivers/staging/cx25821/cx25821-i2c.c index 2b14bcca6897..130dfebebe20 100644 --- a/drivers/staging/cx25821/cx25821-i2c.c +++ b/drivers/staging/cx25821/cx25821-i2c.c @@ -21,6 +21,8 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ +#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt + #include "cx25821.h" #include <linux/i2c.h> @@ -32,10 +34,11 @@ static unsigned int i2c_scan; module_param(i2c_scan, int, 0444); MODULE_PARM_DESC(i2c_scan, "scan i2c bus at insmod time"); -#define dprintk(level, fmt, arg...)\ - do { if (i2c_debug >= level)\ - printk(KERN_DEBUG "%s/0: " fmt, dev->name, ## arg);\ - } while (0) +#define dprintk(level, fmt, arg...) \ +do { \ + if (i2c_debug >= level) \ + printk(KERN_DEBUG "%s/0: " fmt, dev->name, ##arg); \ +} while (0) #define I2C_WAIT_DELAY 32 #define I2C_WAIT_RETRY 64 @@ -98,7 +101,7 @@ static int i2c_sendbytes(struct i2c_adapter *i2c_adap, if (!i2c_slave_did_ack(i2c_adap)) return -EIO; - dprintk(1, "%s() returns 0\n", __func__); + dprintk(1, "%s(): returns 0\n", __func__); return 0; } @@ -163,7 +166,7 @@ eio: retval = -EIO; err: if (i2c_debug) - printk(KERN_ERR " ERR: %d\n", retval); + pr_err(" ERR: %d\n", retval); return retval; } @@ -187,7 +190,7 @@ static int i2c_readbytes(struct i2c_adapter *i2c_adap, if (!i2c_slave_did_ack(i2c_adap)) return -EIO; - dprintk(1, "%s() returns 0\n", __func__); + dprintk(1, "%s(): returns 0\n", __func__); return 0; } @@ -227,7 +230,7 @@ eio: retval = -EIO; err: if (i2c_debug) - printk(KERN_ERR " ERR: %d\n", retval); + pr_err(" ERR: %d\n", retval); return retval; } |