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

[media] dvb: get rid of fepriv->parameters_in

This var were used during DVBv3 times, in order to keep a copy
of the parameters used by the events. This is not needed anymore,
as the parameters are now dynamically generated from the DVBv5
structure.

So, just get rid of it. That means that a DVBv5 pure call won't
use anymore any DVBv3 parameters.

Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

+2 -25
+2 -25
drivers/media/dvb/dvb-core/dvb_frontend.c
··· 108 108 109 109 /* thread/frontend values */ 110 110 struct dvb_device *dvbdev; 111 - struct dvb_frontend_parameters parameters_in; 112 111 struct dvb_frontend_parameters parameters_out; 113 112 struct dvb_fe_events events; 114 113 struct semaphore sem; ··· 695 696 fepriv->algo_status |= DVBFE_ALGO_SEARCH_AGAIN; 696 697 fepriv->delay = HZ / 2; 697 698 } 698 - fepriv->parameters_out = fepriv->parameters_in; 699 699 fe->ops.read_status(fe, &s); 700 700 if (s != fepriv->status) { 701 701 dvb_frontend_add_event(fe, s); /* update event list */ ··· 1559 1561 { 1560 1562 int r = 0; 1561 1563 struct dtv_frontend_properties *c = &fe->dtv_property_cache; 1562 - struct dvb_frontend_private *fepriv = fe->frontend_priv; 1563 - dtv_property_dump(tvp); 1564 1564 1565 1565 /* Allow the frontend to validate incoming properties */ 1566 1566 if (fe->ops.set_property) { ··· 1582 1586 */ 1583 1587 c->state = tvp->cmd; 1584 1588 dprintk("%s() Finalised property cache\n", __func__); 1585 - 1586 - /* Needed, due to status update */ 1587 - dtv_property_legacy_params_sync(fe, &fepriv->parameters_in); 1588 1589 1589 1590 r = dtv_set_frontend(fe); 1590 1591 break; ··· 1842 1849 1843 1850 if (dvb_frontend_check_parameters(fe) < 0) 1844 1851 return -EINVAL; 1845 - 1846 - /* 1847 - * Initialize output parameters to match the values given by 1848 - * the user. FE_SET_FRONTEND triggers an initial frontend event 1849 - * with status = 0, which copies output parameters to userspace. 1850 - * 1851 - * This is still needed for DVBv5 calls, due to event state update. 1852 - */ 1853 - fepriv->parameters_out = fepriv->parameters_in; 1854 1852 1855 1853 /* 1856 1854 * Be sure that the bandwidth will be filled for all ··· 2157 2173 break; 2158 2174 2159 2175 case FE_SET_FRONTEND: 2160 - /* Synchronise DVBv5 parameters from DVBv3 */ 2161 - memcpy (&fepriv->parameters_in, parg, 2162 - sizeof (struct dvb_frontend_parameters)); 2163 - 2164 2176 err = set_delivery_system(fe, SYS_UNDEFINED); 2165 2177 if (err) 2166 2178 break; 2167 2179 2168 - err = dtv_property_cache_sync(fe, c, &fepriv->parameters_in); 2180 + err = dtv_property_cache_sync(fe, c, parg); 2169 2181 if (err) 2170 2182 break; 2171 2183 err = dtv_set_frontend(fe); ··· 2171 2191 break; 2172 2192 2173 2193 case FE_GET_FRONTEND: 2174 - err = dtv_get_frontend(fe, &fepriv->parameters_out); 2175 - if (err >= 0) 2176 - memcpy(parg, &fepriv->parameters_out, 2177 - sizeof(struct dvb_frontend_parameters)); 2194 + err = dtv_get_frontend(fe, parg); 2178 2195 break; 2179 2196 2180 2197 case FE_SET_FRONTEND_TUNE_MODE: