Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

media: dvb_frontend: get rid of get_property() callback

Only lg2160 implement gets_property, but there's no need for that,
as no other driver calls this callback, as get_frontend() does the
same, and set_frontend() also calls lg2160 get_frontend().

So, get rid of it.

Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
Reviewed-by: Michael Ira Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>

+1 -25
+1 -8
drivers/media/dvb-core/dvb_frontend.c
··· 1308 1308 struct dtv_property *tvp, 1309 1309 struct file *file) 1310 1310 { 1311 - int r, ncaps; 1311 + int ncaps; 1312 1312 1313 1313 switch(tvp->cmd) { 1314 1314 case DTV_ENUM_DELSYS: ··· 1517 1517 "%s: FE property %d doesn't exist\n", 1518 1518 __func__, tvp->cmd); 1519 1519 return -EINVAL; 1520 - } 1521 - 1522 - /* Allow the frontend to override outgoing properties */ 1523 - if (fe->ops.get_property) { 1524 - r = fe->ops.get_property(fe, tvp); 1525 - if (r < 0) 1526 - return r; 1527 1520 } 1528 1521 1529 1522 dtv_property_dump(fe, false, tvp);
-3
drivers/media/dvb-core/dvb_frontend.h
··· 403 403 * @analog_ops: pointer to struct analog_demod_ops 404 404 * @set_property: callback function to allow the frontend to validade 405 405 * incoming properties. Should not be used on new drivers. 406 - * @get_property: callback function to allow the frontend to override 407 - * outcoming properties. Should not be used on new drivers. 408 406 */ 409 407 struct dvb_frontend_ops { 410 408 ··· 466 468 struct analog_demod_ops analog_ops; 467 469 468 470 int (*set_property)(struct dvb_frontend* fe, struct dtv_property* tvp); 469 - int (*get_property)(struct dvb_frontend* fe, struct dtv_property* tvp); 470 471 }; 471 472 472 473 #ifdef __DVB_CORE__
-14
drivers/media/dvb-frontends/lg2160.c
··· 1048 1048 return ret; 1049 1049 } 1050 1050 1051 - static int lg216x_get_property(struct dvb_frontend *fe, 1052 - struct dtv_property *tvp) 1053 - { 1054 - struct dtv_frontend_properties *c = &fe->dtv_property_cache; 1055 - 1056 - return (DTV_ATSCMH_FIC_VER == tvp->cmd) ? 1057 - lg216x_get_frontend(fe, c) : 0; 1058 - } 1059 - 1060 - 1061 1051 static int lg2160_set_frontend(struct dvb_frontend *fe) 1062 1052 { 1063 1053 struct lg216x_state *state = fe->demodulator_priv; ··· 1358 1368 .init = lg216x_init, 1359 1369 .sleep = lg216x_sleep, 1360 1370 #endif 1361 - .get_property = lg216x_get_property, 1362 - 1363 1371 .set_frontend = lg2160_set_frontend, 1364 1372 .get_frontend = lg216x_get_frontend, 1365 1373 .get_tune_settings = lg216x_get_tune_settings, ··· 1384 1396 .init = lg216x_init, 1385 1397 .sleep = lg216x_sleep, 1386 1398 #endif 1387 - .get_property = lg216x_get_property, 1388 - 1389 1399 .set_frontend = lg2160_set_frontend, 1390 1400 .get_frontend = lg216x_get_frontend, 1391 1401 .get_tune_settings = lg216x_get_tune_settings,