aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew de Quincey <adq_dvb@lidskialf.net>2006-08-08 08:10:09 -0400
committerMauro Carvalho Chehab <mchehab@infradead.org>2006-09-26 10:53:26 -0400
commit2a514dea5fda67958c79f5137d4dcb272f8561e8 (patch)
treef8909c2b622d7a4dbd51ed73017c1c4101507ca8
parent1f10c7afa1ac611c32ec4a2114788876a3f5d05e (diff)
V4L/DVB (4389): Remove duplication _release() op.
I added a duplicate method during one of the previous dvb_attach attempts. This removes the unnecessary duplication. Signed-off-by: Andrew de Quincey <adq_dvb@lidskialf.net> Acked-by: Trent Piepho <xyzzy@speakeasy.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
-rw-r--r--drivers/media/dvb/frontends/tda1004x.c12
1 files changed, 3 insertions, 9 deletions
diff --git a/drivers/media/dvb/frontends/tda1004x.c b/drivers/media/dvb/frontends/tda1004x.c
index 478d97735407..11e0dca9a2d7 100644
--- a/drivers/media/dvb/frontends/tda1004x.c
+++ b/drivers/media/dvb/frontends/tda1004x.c
@@ -1195,13 +1195,7 @@ static int tda1004x_get_tune_settings(struct dvb_frontend* fe, struct dvb_fronte
1195 return 0; 1195 return 0;
1196} 1196}
1197 1197
1198static void tda10045_release(struct dvb_frontend* fe) 1198static void tda1004x_release(struct dvb_frontend* fe)
1199{
1200 struct tda1004x_state *state = fe->demodulator_priv;
1201 kfree(state);
1202}
1203
1204static void tda10046_release(struct dvb_frontend* fe)
1205{ 1199{
1206 struct tda1004x_state *state = fe->demodulator_priv; 1200 struct tda1004x_state *state = fe->demodulator_priv;
1207 kfree(state); 1201 kfree(state);
@@ -1221,7 +1215,7 @@ static struct dvb_frontend_ops tda10045_ops = {
1221 FE_CAN_TRANSMISSION_MODE_AUTO | FE_CAN_GUARD_INTERVAL_AUTO 1215 FE_CAN_TRANSMISSION_MODE_AUTO | FE_CAN_GUARD_INTERVAL_AUTO
1222 }, 1216 },
1223 1217
1224 .release = tda10045_release, 1218 .release = tda1004x_release,
1225 1219
1226 .init = tda10045_init, 1220 .init = tda10045_init,
1227 .sleep = tda1004x_sleep, 1221 .sleep = tda1004x_sleep,
@@ -1280,7 +1274,7 @@ static struct dvb_frontend_ops tda10046_ops = {
1280 FE_CAN_TRANSMISSION_MODE_AUTO | FE_CAN_GUARD_INTERVAL_AUTO 1274 FE_CAN_TRANSMISSION_MODE_AUTO | FE_CAN_GUARD_INTERVAL_AUTO
1281 }, 1275 },
1282 1276
1283 .release = tda10046_release, 1277 .release = tda1004x_release,
1284 1278
1285 .init = tda10046_init, 1279 .init = tda10046_init,
1286 .sleep = tda1004x_sleep, 1280 .sleep = tda1004x_sleep,