Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[media] tda18212: Use standard logging, remove tda18212_priv.h

Browse source 
Use the more current logging styles with pr_fmt.
Remove now unnecessary private include.

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
Joe Perches 2011-07-31 04:30:10 -03:00 • committed by Mauro Carvalho Chehab
parent be85fefecb
commit 2b50763a0b
2 changed files with 23 additions and 52 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
drivers/media/common/tuners/tda18212.c
View file

@ -18,7 +18,20 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/ */
#include "tda18212_priv.h" #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
#include "tda18212.h"
struct tda18212_priv {
struct tda18212_config *cfg;
struct i2c_adapter *i2c;
};
#define dbg(fmt, arg...) \
do { \
if (debug) \
pr_info("%s: " fmt, __func__, ##arg); \
} while (0)
static int debug; static int debug;
module_param(debug, int, 0644); module_param(debug, int, 0644);
@ -46,7 +59,8 @@ static int tda18212_wr_regs(struct tda18212_priv *priv, u8 reg, u8 *val,
if (ret == 1) { if (ret == 1) {
ret = 0; ret = 0;
} else { } else {
warn("i2c wr failed ret:%d reg:%02x len:%d", ret, reg, len); pr_warn("i2c wr failed ret:%d reg:%02x len:%d\n",
ret, reg, len);
ret = -EREMOTEIO; ret = -EREMOTEIO;
} }
return ret; return ret;
@ -77,7 +91,8 @@ static int tda18212_rd_regs(struct tda18212_priv *priv, u8 reg, u8 *val,
memcpy(val, buf, len); memcpy(val, buf, len);
ret = 0; ret = 0;
} else { } else {
warn("i2c rd failed ret:%d reg:%02x len:%d", ret, reg, len); pr_warn("i2c rd failed ret:%d reg:%02x len:%d\n",
ret, reg, len);
ret = -EREMOTEIO; ret = -EREMOTEIO;
} }
@ -129,8 +144,8 @@ static int tda18212_set_params(struct dvb_frontend *fe,
{ 0x92, 0x53, 0x03 }, /* DVB-C */ { 0x92, 0x53, 0x03 }, /* DVB-C */
}; };
dbg("%s: delsys=%d RF=%d BW=%d", __func__, dbg("delsys=%d RF=%d BW=%d\n",
c->delivery_system, c->frequency, c->bandwidth_hz); c->delivery_system, c->frequency, c->bandwidth_hz);
if (fe->ops.i2c_gate_ctrl) if (fe->ops.i2c_gate_ctrl)
fe->ops.i2c_gate_ctrl(fe, 1); /* open I2C-gate */ fe->ops.i2c_gate_ctrl(fe, 1); /* open I2C-gate */
@ -196,7 +211,7 @@ static int tda18212_set_params(struct dvb_frontend *fe,
return ret; return ret;
error: error:
dbg("%s: failed:%d", __func__, ret); dbg("failed:%d\n", ret);
goto exit; goto exit;
} }
@ -245,13 +260,13 @@ struct dvb_frontend *tda18212_attach(struct dvb_frontend *fe,
if (fe->ops.i2c_gate_ctrl) if (fe->ops.i2c_gate_ctrl)
fe->ops.i2c_gate_ctrl(fe, 0); /* close I2C-gate */ fe->ops.i2c_gate_ctrl(fe, 0); /* close I2C-gate */
dbg("%s: ret:%d chip ID:%02x", __func__, ret, val); dbg("ret:%d chip ID:%02x\n", ret, val);
if (ret || val != 0xc7) { if (ret || val != 0xc7) {
kfree(priv); kfree(priv);
return NULL; return NULL;
} }
info("NXP TDA18212HN successfully identified."); pr_info("NXP TDA18212HN successfully identified\n");
memcpy(&fe->ops.tuner_ops, &tda18212_tuner_ops, memcpy(&fe->ops.tuner_ops, &tda18212_tuner_ops,
sizeof(struct dvb_tuner_ops)); sizeof(struct dvb_tuner_ops));

44
drivers/media/common/tuners/tda18212_priv.h
View file

@ -1,44 +0,0 @@
/*
* NXP TDA18212HN silicon tuner driver
*
* Copyright (C) 2011 Antti Palosaari <crope@iki.fi>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License along
* with this program; if not, write to the Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#ifndef TDA18212_PRIV_H
#define TDA18212_PRIV_H
#include "tda18212.h"
#define LOG_PREFIX "tda18212"
#undef dbg
#define dbg(f, arg...) \
if (debug) \
printk(KERN_INFO LOG_PREFIX": " f "\n" , ## arg)
#undef err
#define err(f, arg...) printk(KERN_ERR LOG_PREFIX": " f "\n" , ## arg)
#undef info
#define info(f, arg...) printk(KERN_INFO LOG_PREFIX": " f "\n" , ## arg)
#undef warn
#define warn(f, arg...) printk(KERN_WARNING LOG_PREFIX": " f "\n" , ## arg)
struct tda18212_priv {
struct tda18212_config *cfg;
struct i2c_adapter *i2c;
};
#endif