aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/media/dvb/frontends/stv0900_core.c20
1 files changed, 4 insertions, 16 deletions
diff --git a/drivers/media/dvb/frontends/stv0900_core.c b/drivers/media/dvb/frontends/stv0900_core.c
index ca26518eafcd..3cc6626fe633 100644
--- a/drivers/media/dvb/frontends/stv0900_core.c
+++ b/drivers/media/dvb/frontends/stv0900_core.c
@@ -59,20 +59,10 @@ static struct stv0900_inode *find_inode(struct i2c_adapter *i2c_adap,
59 find it by i2c adapter and i2c address */ 59 find it by i2c adapter and i2c address */
60 while ((temp_chip != NULL) && 60 while ((temp_chip != NULL) &&
61 ((temp_chip->internal->i2c_adap != i2c_adap) || 61 ((temp_chip->internal->i2c_adap != i2c_adap) ||
62 (temp_chip->internal->i2c_addr != i2c_addr))) { 62 (temp_chip->internal->i2c_addr != i2c_addr)))
63 63
64 temp_chip = temp_chip->next_inode; 64 temp_chip = temp_chip->next_inode;
65 dprintk(KERN_INFO "%s: store.adap %x\n", __func__, 65
66 (int)&(*temp_chip->internal->i2c_adap));
67 dprintk(KERN_INFO "%s: init.adap %x\n", __func__,
68 (int)&(*i2c_adap));
69 }
70 if (temp_chip != NULL) {/* find by i2c adapter & address */
71 dprintk(KERN_INFO "%s: store.adap %x\n", __func__,
72 (int)temp_chip->internal->i2c_adap);
73 dprintk(KERN_INFO "%s: init.adap %x\n", __func__,
74 (int)i2c_adap);
75 }
76 } 66 }
77 67
78 return temp_chip; 68 return temp_chip;
@@ -1492,7 +1482,7 @@ static enum dvbfe_search stv0900_search(struct dvb_frontend *fe,
1492 1482
1493 enum fe_stv0900_error error = STV0900_NO_ERROR; 1483 enum fe_stv0900_error error = STV0900_NO_ERROR;
1494 1484
1495 dprintk(KERN_INFO "%s: Internal = %x\n", __func__, (u32)i_params); 1485 dprintk(KERN_INFO "%s: ", __func__);
1496 1486
1497 p_result.locked = FALSE; 1487 p_result.locked = FALSE;
1498 p_search.path = state->demod; 1488 p_search.path = state->demod;
@@ -1607,7 +1597,7 @@ static int stv0900_read_status(struct dvb_frontend *fe, enum fe_status *status)
1607{ 1597{
1608 struct stv0900_state *state = fe->demodulator_priv; 1598 struct stv0900_state *state = fe->demodulator_priv;
1609 1599
1610 dprintk("%s: Internal = %x\n", __func__, (unsigned int)state->internal); 1600 dprintk("%s: ", __func__);
1611 1601
1612 if ((stv0900_status(state->internal, state->demod)) == TRUE) { 1602 if ((stv0900_status(state->internal, state->demod)) == TRUE) {
1613 dprintk("DEMOD LOCK OK\n"); 1603 dprintk("DEMOD LOCK OK\n");
@@ -1920,8 +1910,6 @@ struct dvb_frontend *stv0900_attach(const struct stv0900_config *config,
1920 if (err_stv0900) 1910 if (err_stv0900)
1921 goto error; 1911 goto error;
1922 1912
1923 dprintk(KERN_INFO "%s: Init Result = %d, handle_stv0900 = %x\n",
1924 __func__, err_stv0900, (unsigned int)state->internal);
1925 break; 1913 break;
1926 default: 1914 default:
1927 goto error; 1915 goto error;