Skip to content

L
linux
Commit 2c7e3ca8 authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab Committed by Mauro Carvalho Chehab
Browse files
Options

media: dvbsky: use the new dvb_module_probe() API 

Instead of repeating countless times a complex logic, use
the new dvb_module_probe()/dvb_module_release(), simplifying
the module.

That reduced about 15% at the module's size:

   text	   data	    bss	    dec	    hex	filename
   7083	   1108	     12	   8203	   200b	old/drivers/media/usb/dvb-usb-v2/dvbsky.o
   5817	   1108	     12	   6937	   1b19	new/drivers/media/usb/dvb-usb-v2/dvbsky.o

Tested with a DVBSky S960C DVB-S2 tuner (0572:960c)
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@s-opensource.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+samsung@kernel.org>
parent edcc3082
Hide whitespace changes
Inline Side-by-side
Showing with 127 additions and 279 deletions
drivers/media/usb/dvb-usb-v2/dvbsky.c
View file @ 2c7e3ca8
...@@ -290,61 +290,44 @@ static int dvbsky_usb_read_status(struct dvb_frontend *fe, ...@@ -290,61 +290,44 @@ static int dvbsky_usb_read_status(struct dvb_frontend *fe,
return ret; return ret;
} }
static const struct m88ds3103_config dvbsky_s960_m88ds3103_config = {
.i2c_addr = 0x68,
.clock = 27000000,
.i2c_wr_max = 33,
.clock_out = 0,
.ts_mode = M88DS3103_TS_CI,
.ts_clk = 16000,
.ts_clk_pol = 0,
.agc = 0x99,
.lnb_hv_pol = 1,
.lnb_en_pol = 1,
};
static int dvbsky_s960_attach(struct dvb_usb_adapter *adap) static int dvbsky_s960_attach(struct dvb_usb_adapter *adap)
{ {
struct dvbsky_state *state = adap_to_priv(adap); struct dvbsky_state *state = adap_to_priv(adap);
struct dvb_usb_device *d = adap_to_d(adap); struct dvb_usb_device *d = adap_to_d(adap);
int ret = 0; struct i2c_adapter *i2c_adapter;
/* demod I2C adapter */ struct m88ds3103_platform_data m88ds3103_pdata = {};
struct i2c_adapter *i2c_adapter = NULL;
struct i2c_client *client;
struct i2c_board_info info;
struct ts2020_config ts2020_config = {}; struct ts2020_config ts2020_config = {};
memset(&info, 0, sizeof(struct i2c_board_info));
/* attach demod */ /* attach demod */
adap->fe[0] = dvb_attach(m88ds3103_attach, m88ds3103_pdata.clk = 27000000;
&dvbsky_s960_m88ds3103_config, m88ds3103_pdata.i2c_wr_max = 33;
&d->i2c_adap, m88ds3103_pdata.clk_out = 0;
&i2c_adapter); m88ds3103_pdata.ts_mode = M88DS3103_TS_CI;
if (!adap->fe[0]) { m88ds3103_pdata.ts_clk = 16000;
dev_err(&d->udev->dev, "dvbsky_s960_attach fail.\n"); m88ds3103_pdata.ts_clk_pol = 0;
ret = -ENODEV; m88ds3103_pdata.agc = 0x99;
goto fail_attach; m88ds3103_pdata.lnb_hv_pol = 1,
} m88ds3103_pdata.lnb_en_pol = 1,
state->i2c_client_demod = dvb_module_probe("m88ds3103", NULL,
&d->i2c_adap,
0x68, &m88ds3103_pdata);
if (!state->i2c_client_demod)
return -ENODEV;
adap->fe[0] = m88ds3103_pdata.get_dvb_frontend(state->i2c_client_demod);
i2c_adapter = m88ds3103_pdata.get_i2c_adapter(state->i2c_client_demod);
/* attach tuner */ /* attach tuner */
ts2020_config.fe = adap->fe[0]; ts2020_config.fe = adap->fe[0];
ts2020_config.get_agc_pwm = m88ds3103_get_agc_pwm; ts2020_config.get_agc_pwm = m88ds3103_get_agc_pwm;
strlcpy(info.type, "ts2020", I2C_NAME_SIZE);
info.addr = 0x60;
info.platform_data = &ts2020_config;
request_module("ts2020");
client = i2c_new_device(i2c_adapter, &info);
if (client == NULL || client->dev.driver == NULL) {
dvb_frontend_detach(adap->fe[0]);
ret = -ENODEV;
goto fail_attach;
}
if (!try_module_get(client->dev.driver->owner)) { state->i2c_client_tuner = dvb_module_probe("ts2020", NULL,
i2c_unregister_device(client); i2c_adapter,
dvb_frontend_detach(adap->fe[0]); 0x60, &ts2020_config);
ret = -ENODEV; if (!state->i2c_client_tuner) {
goto fail_attach; dvb_module_release(state->i2c_client_demod);
return -ENODEV;
} }
/* delegate signal strength measurement to tuner */ /* delegate signal strength measurement to tuner */
...@@ -359,10 +342,7 @@ static int dvbsky_s960_attach(struct dvb_usb_adapter *adap) ...@@ -359,10 +342,7 @@ static int dvbsky_s960_attach(struct dvb_usb_adapter *adap)
state->fe_set_voltage = adap->fe[0]->ops.set_voltage; state->fe_set_voltage = adap->fe[0]->ops.set_voltage;
adap->fe[0]->ops.set_voltage = dvbsky_usb_set_voltage; adap->fe[0]->ops.set_voltage = dvbsky_usb_set_voltage;
state->i2c_client_tuner = client; return 0;
fail_attach:
return ret;
} }
static int dvbsky_usb_ci_set_voltage(struct dvb_frontend *fe, static int dvbsky_usb_ci_set_voltage(struct dvb_frontend *fe,
...@@ -412,80 +392,60 @@ static int dvbsky_ci_ctrl(void *priv, u8 read, int addr, ...@@ -412,80 +392,60 @@ static int dvbsky_ci_ctrl(void *priv, u8 read, int addr,
return ret; return ret;
} }
static const struct m88ds3103_config dvbsky_s960c_m88ds3103_config = {
.i2c_addr = 0x68,
.clock = 27000000,
.i2c_wr_max = 33,
.clock_out = 0,
.ts_mode = M88DS3103_TS_CI,
.ts_clk = 10000,
.ts_clk_pol = 1,
.agc = 0x99,
.lnb_hv_pol = 0,
.lnb_en_pol = 1,
};
static int dvbsky_s960c_attach(struct dvb_usb_adapter *adap) static int dvbsky_s960c_attach(struct dvb_usb_adapter *adap)
{ {
struct dvbsky_state *state = adap_to_priv(adap); struct dvbsky_state *state = adap_to_priv(adap);
struct dvb_usb_device *d = adap_to_d(adap); struct dvb_usb_device *d = adap_to_d(adap);
int ret = 0; struct i2c_adapter *i2c_adapter;
/* demod I2C adapter */ struct m88ds3103_platform_data m88ds3103_pdata = {};
struct i2c_adapter *i2c_adapter = NULL;
struct i2c_client *client_tuner, *client_ci;
struct i2c_board_info info;
struct sp2_config sp2_config;
struct ts2020_config ts2020_config = {}; struct ts2020_config ts2020_config = {};
memset(&info, 0, sizeof(struct i2c_board_info)); struct sp2_config sp2_config = {};
/* attach demod */ /* attach demod */
adap->fe[0] = dvb_attach(m88ds3103_attach, m88ds3103_pdata.clk = 27000000,
&dvbsky_s960c_m88ds3103_config, m88ds3103_pdata.i2c_wr_max = 33,
&d->i2c_adap, m88ds3103_pdata.clk_out = 0,
&i2c_adapter); m88ds3103_pdata.ts_mode = M88DS3103_TS_CI,
if (!adap->fe[0]) { m88ds3103_pdata.ts_clk = 10000,
dev_err(&d->udev->dev, "dvbsky_s960ci_attach fail.\n"); m88ds3103_pdata.ts_clk_pol = 1,
ret = -ENODEV; m88ds3103_pdata.agc = 0x99,
goto fail_attach; m88ds3103_pdata.lnb_hv_pol = 0,
} m88ds3103_pdata.lnb_en_pol = 1,
state->i2c_client_demod = dvb_module_probe("m88ds3103", NULL,
&d->i2c_adap,
0x68, &m88ds3103_pdata);
if (!state->i2c_client_demod)
return -ENODEV;
adap->fe[0] = m88ds3103_pdata.get_dvb_frontend(state->i2c_client_demod);
i2c_adapter = m88ds3103_pdata.get_i2c_adapter(state->i2c_client_demod);
/* attach tuner */ /* attach tuner */
ts2020_config.fe = adap->fe[0]; ts2020_config.fe = adap->fe[0];
ts2020_config.get_agc_pwm = m88ds3103_get_agc_pwm; ts2020_config.get_agc_pwm = m88ds3103_get_agc_pwm;
strlcpy(info.type, "ts2020", I2C_NAME_SIZE);
info.addr = 0x60;
info.platform_data = &ts2020_config;
request_module("ts2020");
client_tuner = i2c_new_device(i2c_adapter, &info);
if (client_tuner == NULL || client_tuner->dev.driver == NULL) {
ret = -ENODEV;
goto fail_tuner_device;
}
if (!try_module_get(client_tuner->dev.driver->owner)) { state->i2c_client_tuner = dvb_module_probe("ts2020", NULL,
ret = -ENODEV; i2c_adapter,
goto fail_tuner_module; 0x60, &ts2020_config);
if (!state->i2c_client_tuner) {
dvb_module_release(state->i2c_client_demod);
return -ENODEV;
} }
/* attach ci controller */ /* attach ci controller */
memset(&sp2_config, 0, sizeof(sp2_config));
sp2_config.dvb_adap = &adap->dvb_adap; sp2_config.dvb_adap = &adap->dvb_adap;
sp2_config.priv = d; sp2_config.priv = d;
sp2_config.ci_control = dvbsky_ci_ctrl; sp2_config.ci_control = dvbsky_ci_ctrl;
memset(&info, 0, sizeof(struct i2c_board_info));
strlcpy(info.type, "sp2", I2C_NAME_SIZE);
info.addr = 0x40;
info.platform_data = &sp2_config;
request_module("sp2");
client_ci = i2c_new_device(&d->i2c_adap, &info);
if (client_ci == NULL || client_ci->dev.driver == NULL) {
ret = -ENODEV;
goto fail_ci_device;
}
if (!try_module_get(client_ci->dev.driver->owner)) { state->i2c_client_ci = dvb_module_probe("sp2", NULL,
ret = -ENODEV; &d->i2c_adap,
goto fail_ci_module; 0x40, &sp2_config);
if (!state->i2c_client_ci) {
dvb_module_release(state->i2c_client_tuner);
dvb_module_release(state->i2c_client_demod);
return -ENODEV;
} }
/* delegate signal strength measurement to tuner */ /* delegate signal strength measurement to tuner */
...@@ -500,165 +460,92 @@ static int dvbsky_s960c_attach(struct dvb_usb_adapter *adap) ...@@ -500,165 +460,92 @@ static int dvbsky_s960c_attach(struct dvb_usb_adapter *adap)
state->fe_set_voltage = adap->fe[0]->ops.set_voltage; state->fe_set_voltage = adap->fe[0]->ops.set_voltage;
adap->fe[0]->ops.set_voltage = dvbsky_usb_ci_set_voltage; adap->fe[0]->ops.set_voltage = dvbsky_usb_ci_set_voltage;
state->i2c_client_tuner = client_tuner; return 0;
state->i2c_client_ci = client_ci;
return ret;
fail_ci_module:
i2c_unregister_device(client_ci);
fail_ci_device:
module_put(client_tuner->dev.driver->owner);
fail_tuner_module:
i2c_unregister_device(client_tuner);
fail_tuner_device:
dvb_frontend_detach(adap->fe[0]);
fail_attach:
return ret;
} }
static int dvbsky_t680c_attach(struct dvb_usb_adapter *adap) static int dvbsky_t680c_attach(struct dvb_usb_adapter *adap)
{ {
struct dvbsky_state *state = adap_to_priv(adap); struct dvbsky_state *state = adap_to_priv(adap);
struct dvb_usb_device *d = adap_to_d(adap); struct dvb_usb_device *d = adap_to_d(adap);
int ret = 0;
struct i2c_adapter *i2c_adapter; struct i2c_adapter *i2c_adapter;
struct i2c_client *client_demod, *client_tuner, *client_ci; struct si2168_config si2168_config = {};
struct i2c_board_info info; struct si2157_config si2157_config = {};
struct si2168_config si2168_config; struct sp2_config sp2_config = {};
struct si2157_config si2157_config;
struct sp2_config sp2_config;
/* attach demod */ /* attach demod */
memset(&si2168_config, 0, sizeof(si2168_config));
si2168_config.i2c_adapter = &i2c_adapter; si2168_config.i2c_adapter = &i2c_adapter;
si2168_config.fe = &adap->fe[0]; si2168_config.fe = &adap->fe[0];
si2168_config.ts_mode = SI2168_TS_PARALLEL; si2168_config.ts_mode = SI2168_TS_PARALLEL;
memset(&info, 0, sizeof(struct i2c_board_info));
strlcpy(info.type, "si2168", I2C_NAME_SIZE); state->i2c_client_demod = dvb_module_probe("si2168", NULL,
info.addr = 0x64; &d->i2c_adap,
info.platform_data = &si2168_config; 0x64, &si2168_config);
if (!state->i2c_client_demod)
request_module(info.type); return -ENODEV;
client_demod = i2c_new_device(&d->i2c_adap, &info);
if (client_demod == NULL ||
client_demod->dev.driver == NULL)
goto fail_demod_device;
if (!try_module_get(client_demod->dev.driver->owner))
goto fail_demod_module;
/* attach tuner */ /* attach tuner */
memset(&si2157_config, 0, sizeof(si2157_config));
si2157_config.fe = adap->fe[0]; si2157_config.fe = adap->fe[0];
si2157_config.if_port = 1; si2157_config.if_port = 1;
memset(&info, 0, sizeof(struct i2c_board_info));
strlcpy(info.type, "si2157", I2C_NAME_SIZE); state->i2c_client_tuner = dvb_module_probe("si2157", NULL,
info.addr = 0x60; i2c_adapter,
info.platform_data = &si2157_config; 0x60, &si2157_config);
if (!state->i2c_client_tuner) {
request_module(info.type); dvb_module_release(state->i2c_client_demod);
client_tuner = i2c_new_device(i2c_adapter, &info); return -ENODEV;
if (client_tuner == NULL || }
client_tuner->dev.driver == NULL)
goto fail_tuner_device;
if (!try_module_get(client_tuner->dev.driver->owner))
goto fail_tuner_module;
/* attach ci controller */ /* attach ci controller */
memset(&sp2_config, 0, sizeof(sp2_config));
sp2_config.dvb_adap = &adap->dvb_adap; sp2_config.dvb_adap = &adap->dvb_adap;
sp2_config.priv = d; sp2_config.priv = d;
sp2_config.ci_control = dvbsky_ci_ctrl; sp2_config.ci_control = dvbsky_ci_ctrl;
memset(&info, 0, sizeof(struct i2c_board_info));
strlcpy(info.type, "sp2", I2C_NAME_SIZE);
info.addr = 0x40;
info.platform_data = &sp2_config;
request_module(info.type);
client_ci = i2c_new_device(&d->i2c_adap, &info);
if (client_ci == NULL || client_ci->dev.driver == NULL) state->i2c_client_ci = dvb_module_probe("sp2", NULL,
goto fail_ci_device; &d->i2c_adap,
0x40, &sp2_config);
if (!try_module_get(client_ci->dev.driver->owner)) if (!state->i2c_client_ci) {
goto fail_ci_module; dvb_module_release(state->i2c_client_tuner);
dvb_module_release(state->i2c_client_demod);
return -ENODEV;
}
state->i2c_client_demod = client_demod; return 0;
state->i2c_client_tuner = client_tuner;
state->i2c_client_ci = client_ci;
return ret;
fail_ci_module:
i2c_unregister_device(client_ci);
fail_ci_device:
module_put(client_tuner->dev.driver->owner);
fail_tuner_module:
i2c_unregister_device(client_tuner);
fail_tuner_device:
module_put(client_demod->dev.driver->owner);
fail_demod_module:
i2c_unregister_device(client_demod);
fail_demod_device:
ret = -ENODEV;
return ret;
} }
static int dvbsky_t330_attach(struct dvb_usb_adapter *adap) static int dvbsky_t330_attach(struct dvb_usb_adapter *adap)
{ {
struct dvbsky_state *state = adap_to_priv(adap); struct dvbsky_state *state = adap_to_priv(adap);
struct dvb_usb_device *d = adap_to_d(adap); struct dvb_usb_device *d = adap_to_d(adap);
int ret = 0;
struct i2c_adapter *i2c_adapter; struct i2c_adapter *i2c_adapter;
struct i2c_client *client_demod, *client_tuner; struct si2168_config si2168_config = {};
struct i2c_board_info info; struct si2157_config si2157_config = {};
struct si2168_config si2168_config;
struct si2157_config si2157_config;
/* attach demod */ /* attach demod */
memset(&si2168_config, 0, sizeof(si2168_config));
si2168_config.i2c_adapter = &i2c_adapter; si2168_config.i2c_adapter = &i2c_adapter;
si2168_config.fe = &adap->fe[0]; si2168_config.fe = &adap->fe[0];
si2168_config.ts_mode = SI2168_TS_PARALLEL; si2168_config.ts_mode = SI2168_TS_PARALLEL;
si2168_config.ts_clock_gapped = true; si2168_config.ts_clock_gapped = true;
memset(&info, 0, sizeof(struct i2c_board_info));
strlcpy(info.type, "si2168", I2C_NAME_SIZE); state->i2c_client_demod = dvb_module_probe("si2168", NULL,
info.addr = 0x64; &d->i2c_adap,
info.platform_data = &si2168_config; 0x64, &si2168_config);
if (!state->i2c_client_demod)
request_module(info.type); return -ENODEV;
client_demod = i2c_new_device(&d->i2c_adap, &info);
if (client_demod == NULL ||
client_demod->dev.driver == NULL)
goto fail_demod_device;
if (!try_module_get(client_demod->dev.driver->owner))
goto fail_demod_module;
/* attach tuner */ /* attach tuner */
memset(&si2157_config, 0, sizeof(si2157_config));
si2157_config.fe = adap->fe[0]; si2157_config.fe = adap->fe[0];
si2157_config.if_port = 1; si2157_config.if_port = 1;
memset(&info, 0, sizeof(struct i2c_board_info));
strlcpy(info.type, "si2157", I2C_NAME_SIZE); state->i2c_client_tuner = dvb_module_probe("si2157", NULL,
info.addr = 0x60; i2c_adapter,
info.platform_data = &si2157_config; 0x60, &si2157_config);
if (!state->i2c_client_tuner) {
request_module(info.type); dvb_module_release(state->i2c_client_demod);
client_tuner = i2c_new_device(i2c_adapter, &info); return -ENODEV;
if (client_tuner == NULL || }
client_tuner->dev.driver == NULL)
goto fail_tuner_device; return 0;
if (!try_module_get(client_tuner->dev.driver->owner))
goto fail_tuner_module;
state->i2c_client_demod = client_demod;
state->i2c_client_tuner = client_tuner;
return ret;
fail_tuner_module:
i2c_unregister_device(client_tuner);
fail_tuner_device:
module_put(client_demod->dev.driver->owner);
fail_demod_module:
i2c_unregister_device(client_demod);
fail_demod_device:
ret = -ENODEV;
return ret;
} }
static int dvbsky_mygica_t230c_attach(struct dvb_usb_adapter *adap) static int dvbsky_mygica_t230c_attach(struct dvb_usb_adapter *adap)
...@@ -666,57 +553,34 @@ static int dvbsky_mygica_t230c_attach(struct dvb_usb_adapter *adap) ...@@ -666,57 +553,34 @@ static int dvbsky_mygica_t230c_attach(struct dvb_usb_adapter *adap)
struct dvbsky_state *state = adap_to_priv(adap); struct dvbsky_state *state = adap_to_priv(adap);
struct dvb_usb_device *d = adap_to_d(adap); struct dvb_usb_device *d = adap_to_d(adap);
struct i2c_adapter *i2c_adapter; struct i2c_adapter *i2c_adapter;
struct i2c_client *client_demod, *client_tuner; struct si2168_config si2168_config = {};
struct i2c_board_info info; struct si2157_config si2157_config = {};
struct si2168_config si2168_config;
struct si2157_config si2157_config;
/* attach demod */ /* attach demod */
memset(&si2168_config, 0, sizeof(si2168_config));
si2168_config.i2c_adapter = &i2c_adapter; si2168_config.i2c_adapter = &i2c_adapter;
si2168_config.fe = &adap->fe[0]; si2168_config.fe = &adap->fe[0];
si2168_config.ts_mode = SI2168_TS_PARALLEL; si2168_config.ts_mode = SI2168_TS_PARALLEL;
si2168_config.ts_clock_inv = 1; si2168_config.ts_clock_inv = 1;
memset(&info, 0, sizeof(struct i2c_board_info));
strlcpy(info.type, "si2168", sizeof(info.type)); state->i2c_client_demod = dvb_module_probe("si2168", NULL,
info.addr = 0x64; &d->i2c_adap,
info.platform_data = &si2168_config; 0x64, &si2168_config);
if (!state->i2c_client_demod)
request_module("si2168"); return -ENODEV;
client_demod = i2c_new_device(&d->i2c_adap, &info);
if (!client_demod || !client_demod->dev.driver)
goto fail_demod_device;
if (!try_module_get(client_demod->dev.driver->owner))
goto fail_demod_module;
/* attach tuner */ /* attach tuner */
memset(&si2157_config, 0, sizeof(si2157_config));
si2157_config.fe = adap->fe[0]; si2157_config.fe = adap->fe[0];
si2157_config.if_port = 0; si2157_config.if_port = 0;
memset(&info, 0, sizeof(struct i2c_board_info));
strlcpy(info.type, "si2141", sizeof(info.type));
info.addr = 0x60;
info.platform_data = &si2157_config;
request_module("si2157");
client_tuner = i2c_new_device(i2c_adapter, &info);
if (!client_tuner || !client_tuner->dev.driver)
goto fail_tuner_device;
if (!try_module_get(client_tuner->dev.driver->owner))
goto fail_tuner_module;
state->i2c_client_demod = client_demod;
state->i2c_client_tuner = client_tuner;
return 0;
fail_tuner_module: state->i2c_client_tuner = dvb_module_probe("si2157", "si2141",
i2c_unregister_device(client_tuner); i2c_adapter,
fail_tuner_device: 0x60, &si2157_config);
module_put(client_demod->dev.driver->owner); if (!state->i2c_client_tuner) {
fail_demod_module: dvb_module_release(state->i2c_client_demod);
i2c_unregister_device(client_demod); return -ENODEV;
fail_demod_device: }
return -ENODEV;
return 0;
} }
...@@ -754,26 +618,10 @@ static int dvbsky_init(struct dvb_usb_device *d) ...@@ -754,26 +618,10 @@ static int dvbsky_init(struct dvb_usb_device *d)
static void dvbsky_exit(struct dvb_usb_device *d) static void dvbsky_exit(struct dvb_usb_device *d)
{ {
struct dvbsky_state *state = d_to_priv(d); struct dvbsky_state *state = d_to_priv(d);
struct i2c_client *client;
client = state->i2c_client_tuner; dvb_module_release(state->i2c_client_tuner);
/* remove I2C tuner */ dvb_module_release(state->i2c_client_demod);
if (client) { dvb_module_release(state->i2c_client_ci);
module_put(client->dev.driver->owner);
i2c_unregister_device(client);
}
client = state->i2c_client_demod;
/* remove I2C demod */
if (client) {
module_put(client->dev.driver->owner);
i2c_unregister_device(client);
}
client = state->i2c_client_ci;
/* remove I2C ci */
if (client) {
module_put(client->dev.driver->owner);
i2c_unregister_device(client);
}
} }
/* DVB USB Driver stuff */ /* DVB USB Driver stuff */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7