From: Andrew de Quincey Date: Tue, 8 Aug 2006 12:10:09 +0000 (-0300) Subject: V4L/DVB (4389): Remove duplication _release() op. X-Git-Tag: v2.6.19-rc1~643^2~140 X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2a514dea5fda67958c79f5137d4dcb272f8561e8;p=linux-2.6 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 Acked-by: Trent Piepho Signed-off-by: Mauro Carvalho Chehab --- diff --git a/drivers/media/dvb/frontends/tda1004x.c b/drivers/media/dvb/frontends/tda1004x.c index 478d977354..11e0dca9a2 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 return 0; } -static void tda10045_release(struct dvb_frontend* fe) -{ - struct tda1004x_state *state = fe->demodulator_priv; - kfree(state); -} - -static void tda10046_release(struct dvb_frontend* fe) +static void tda1004x_release(struct dvb_frontend* fe) { struct tda1004x_state *state = fe->demodulator_priv; kfree(state); @@ -1221,7 +1215,7 @@ static struct dvb_frontend_ops tda10045_ops = { FE_CAN_TRANSMISSION_MODE_AUTO | FE_CAN_GUARD_INTERVAL_AUTO }, - .release = tda10045_release, + .release = tda1004x_release, .init = tda10045_init, .sleep = tda1004x_sleep, @@ -1280,7 +1274,7 @@ static struct dvb_frontend_ops tda10046_ops = { FE_CAN_TRANSMISSION_MODE_AUTO | FE_CAN_GUARD_INTERVAL_AUTO }, - .release = tda10046_release, + .release = tda1004x_release, .init = tda10046_init, .sleep = tda1004x_sleep,