openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

[media] az6007: make driver less verbose 

Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
Mauro Carvalho Chehab 2011-07-23 11:54:40 -03:00
parent 067fb88c9d
commit f2ba9e5dda
1 changed files with 17 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
drivers/media/dvb/dvb-usb/az6007.c
View File

@ -62,9 +62,9 @@ static int drxk_gate_ctrl(struct dvb_frontend *fe, int enable)
{ {
struct dvb_usb_adapter *adap = fe->sec_priv; struct dvb_usb_adapter *adap = fe->sec_priv;
struct az6007_device_state *st; struct az6007_device_state *st;
int status; int status = 0;
info("%s: %s", __func__, enable ? "enable" : "disable"); deb_info("%s: %s\n", __func__, enable ? "enable" : "disable");
if (!adap) if (!adap)
return -EINVAL; return -EINVAL;
@ -127,8 +127,7 @@ static int az6007_usb_out_op(struct dvb_usb_device *d, u8 req, u16 value,
debug_dump(b, blen, deb_xfer); debug_dump(b, blen, deb_xfer);
if (blen > 64) { if (blen > 64) {
printk(KERN_ERR err("az6007: doesn't suport I2C transactions longer than 64 bytes\n");
"az6007: doesn't suport I2C transactions longer than 64 bytes\n");
return -EOPNOTSUPP; return -EOPNOTSUPP;
} }
@ -138,7 +137,7 @@ static int az6007_usb_out_op(struct dvb_usb_device *d, u8 req, u16 value,
USB_TYPE_VENDOR | USB_DIR_OUT, USB_TYPE_VENDOR | USB_DIR_OUT,
value, index, b, blen, 5000); value, index, b, blen, 5000);
if (ret != blen) { if (ret != blen) {
warn("usb out operation failed. (%d)", ret); err("usb out operation failed. (%d)", ret);
return -EIO; return -EIO;
} }
@ -207,7 +206,8 @@ static int az6007_frontend_poweron(struct dvb_usb_adapter *adap)
u16 index; u16 index;
int blen; int blen;
info("az6007_frontend_poweron adap=%p adap->dev=%p", adap, adap->dev); deb_info("az6007_frontend_poweron adap=%p adap->dev=%p\n",
adap, adap->dev);
req = 0xBC; req = 0xBC;
value = 1; /* power on */ value = 1; /* power on */
@ -245,7 +245,7 @@ static int az6007_frontend_poweron(struct dvb_usb_adapter *adap)
err("az6007_frontend_poweron failed!!!"); err("az6007_frontend_poweron failed!!!");
return -EIO; return -EIO;
} }
info("az6007_frontend_poweron: OK"); deb_info("az6007_frontend_poweron: OK\n");
return 0; return 0;
} }
@ -258,7 +258,7 @@ static int az6007_frontend_reset(struct dvb_usb_adapter *adap)
u16 index; u16 index;
int blen; int blen;
info("az6007_frontend_reset adap=%p adap->dev=%p", adap, adap->dev); deb_info("az6007_frontend_reset adap=%p adap->dev=%p\n", adap, adap->dev);
/* reset demodulator */ /* reset demodulator */
req = 0xC0; req = 0xC0;
@ -295,7 +295,7 @@ static int az6007_frontend_reset(struct dvb_usb_adapter *adap)
msleep_interruptible(200); msleep_interruptible(200);
info("reset az6007 frontend"); deb_info("reset az6007 frontend\n");
return 0; return 0;
} }
@ -361,8 +361,7 @@ static int az6007_frontend_attach(struct dvb_usb_adapter *adap)
az6007_frontend_poweron(adap); az6007_frontend_poweron(adap);
az6007_frontend_reset(adap); az6007_frontend_reset(adap);
info("az6007_frontend_attach: drxk"); info("az6007: attaching demod drxk");
adap->fe = dvb_attach(drxk_attach, &terratec_h7_drxk, adap->fe = dvb_attach(drxk_attach, &terratec_h7_drxk,
&adap->dev->i2c_adap, &adap->fe2); &adap->dev->i2c_adap, &adap->fe2);
if (!adap->fe) { if (!adap->fe) {
@ -370,7 +369,7 @@ static int az6007_frontend_attach(struct dvb_usb_adapter *adap)
goto out_free; goto out_free;
} }
info("Setting hacks"); deb_info("Setting hacks\n");
/* FIXME: do we need a pll semaphore? */ /* FIXME: do we need a pll semaphore? */
adap->fe->sec_priv = adap; adap->fe->sec_priv = adap;
@ -379,7 +378,7 @@ static int az6007_frontend_attach(struct dvb_usb_adapter *adap)
adap->fe->ops.i2c_gate_ctrl = drxk_gate_ctrl; adap->fe->ops.i2c_gate_ctrl = drxk_gate_ctrl;
adap->fe2->id = 1; adap->fe2->id = 1;
info("az6007_frontend_attach: mt2063"); info("az6007: attaching tuner mt2063");
/* Attach mt2063 to DVB-C frontend */ /* Attach mt2063 to DVB-C frontend */
if (adap->fe->ops.i2c_gate_ctrl) if (adap->fe->ops.i2c_gate_ctrl)
adap->fe->ops.i2c_gate_ctrl(adap->fe, 1); adap->fe->ops.i2c_gate_ctrl(adap->fe, 1);
@ -513,7 +512,7 @@ static int az6007_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg msgs[],
mutex_unlock(&d->i2c_mutex); mutex_unlock(&d->i2c_mutex);
if (ret < 0) { if (ret < 0) {
info("%s ERROR: %i\n", __func__, ret); info("%s ERROR: %i", __func__, ret);
return ret; return ret;
} }
return num; return num;
@ -538,11 +537,11 @@ int az6007_identify_state(struct usb_device *udev,
0xb7, USB_TYPE_VENDOR | USB_DIR_IN, 6, 0, b, 0xb7, USB_TYPE_VENDOR | USB_DIR_IN, 6, 0, b,
6, USB_CTRL_GET_TIMEOUT); 6, USB_CTRL_GET_TIMEOUT);
info("FW GET_VERSION length: %d", ret); deb_info("FW GET_VERSION length: %d\n", ret);
*cold = ret <= 0; *cold = ret <= 0;
info("cold: %d", *cold); deb_info("cold: %d\n", *cold);
return 0; return 0;
} }
@ -629,7 +628,7 @@ static struct usb_driver az6007_usb_driver = {
static int __init az6007_usb_module_init(void) static int __init az6007_usb_module_init(void)
{ {
int result; int result;
info("az6007 usb module init"); deb_info("az6007 usb module init\n");
result = usb_register(&az6007_usb_driver); result = usb_register(&az6007_usb_driver);
if (result) { if (result) {
@ -643,7 +642,7 @@ static int __init az6007_usb_module_init(void)
static void __exit az6007_usb_module_exit(void) static void __exit az6007_usb_module_exit(void)
{ {
/* deregister this driver from the USB subsystem */ /* deregister this driver from the USB subsystem */
info("az6007 usb module exit"); deb_info("az6007 usb module exit\n");
usb_deregister(&az6007_usb_driver); usb_deregister(&az6007_usb_driver);
} }