diff options
author | Daniel Scheller <d.scheller@gmx.net> | 2018-03-07 15:07:56 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@s-opensource.com> | 2018-03-08 06:06:51 -0500 |
commit | 78c4e0820134fdf873c8ab6660b9283bb4be5496 (patch) | |
tree | fca9e27b24399ad055988affd5c4a05f816d5e4c /drivers/media/pci | |
parent | c966453b1386136e47f7c45a6d3b66f4013f974d (diff) | |
download | linux-stable-78c4e0820134fdf873c8ab6660b9283bb4be5496.tar.gz linux-stable-78c4e0820134fdf873c8ab6660b9283bb4be5496.tar.bz2 linux-stable-78c4e0820134fdf873c8ab6660b9283bb4be5496.zip |
media: ngene: use common DVB I2C client handling helpers
Like in ddbridge, get rid of all duplicated I2C client handling constructs
and rather make use of the newly added dvb_module_*() helpers. Makes
things more clean and removes the (cosmetic) need for some variables.
The check on a valid ptr on ci->en isn't really needed since the cxd2099
driver will set it at a time where it is going to return successfully
from probing.
Signed-off-by: Daniel Scheller <d.scheller@gmx.net>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
Diffstat (limited to 'drivers/media/pci')
-rw-r--r-- | drivers/media/pci/ngene/ngene-cards.c | 25 | ||||
-rw-r--r-- | drivers/media/pci/ngene/ngene-core.c | 43 |
2 files changed, 15 insertions, 53 deletions
diff --git a/drivers/media/pci/ngene/ngene-cards.c b/drivers/media/pci/ngene/ngene-cards.c index 37e9f0eb6d20..65fc8f23ad86 100644 --- a/drivers/media/pci/ngene/ngene-cards.c +++ b/drivers/media/pci/ngene/ngene-cards.c @@ -253,15 +253,7 @@ static int tuner_attach_tda18212(struct ngene_channel *chan, u32 dmdtype) .if_dvbt2_8 = 4000, .if_dvbc = 5000, }; - struct i2c_board_info board_info = { - .type = "tda18212", - .platform_data = &config, - }; - - if (chan->number & 1) - board_info.addr = 0x63; - else - board_info.addr = 0x60; + u8 addr = (chan->number & 1) ? 0x63 : 0x60; /* * due to a hardware quirk with the I2C gate on the stv0367+tda18212 @@ -269,20 +261,13 @@ static int tuner_attach_tda18212(struct ngene_channel *chan, u32 dmdtype) * cold started, or it very likely will fail. */ if (dmdtype == DEMOD_TYPE_STV0367) - tuner_tda18212_ping(chan, i2c, board_info.addr); - - request_module(board_info.type); + tuner_tda18212_ping(chan, i2c, addr); - /* perform tuner init/attach */ - client = i2c_new_device(i2c, &board_info); - if (!client || !client->dev.driver) + /* perform tuner probe/init/attach */ + client = dvb_module_probe("tda18212", NULL, i2c, addr, &config); + if (!client) goto err; - if (!try_module_get(client->dev.driver->owner)) { - i2c_unregister_device(client); - goto err; - } - chan->i2c_client[0] = client; chan->i2c_client_fe = 1; diff --git a/drivers/media/pci/ngene/ngene-core.c b/drivers/media/pci/ngene/ngene-core.c index f69a8fc1ec2a..3b9a1bfaf6c0 100644 --- a/drivers/media/pci/ngene/ngene-core.c +++ b/drivers/media/pci/ngene/ngene-core.c @@ -1408,7 +1408,6 @@ static void release_channel(struct ngene_channel *chan) { struct dvb_demux *dvbdemux = &chan->demux; struct ngene *dev = chan->dev; - struct i2c_client *client; if (chan->running) set_transfer(chan, 0); @@ -1427,12 +1426,9 @@ static void release_channel(struct ngene_channel *chan) dvb_unregister_frontend(chan->fe); /* release I2C client (tuner) if needed */ - client = chan->i2c_client[0]; - if (chan->i2c_client_fe && client) { - module_put(client->dev.driver->owner); - i2c_unregister_device(client); + if (chan->i2c_client_fe) { + dvb_module_release(chan->i2c_client[0]); chan->i2c_client[0] = NULL; - client = NULL; } dvb_frontend_detach(chan->fe); @@ -1584,11 +1580,6 @@ static void cxd_attach(struct ngene *dev) struct ngene_ci *ci = &dev->ci; struct cxd2099_cfg cxd_cfg = cxd_cfgtmpl; struct i2c_client *client; - struct i2c_board_info board_info = { - .type = "cxd2099", - .addr = 0x40, - .platform_data = &cxd_cfg, - }; int ret; u8 type; @@ -1605,26 +1596,17 @@ static void cxd_attach(struct ngene *dev) } cxd_cfg.en = &ci->en; - - request_module(board_info.type); - - client = i2c_new_device(&dev->channel[0].i2c_adapter, &board_info); - if (!client || !client->dev.driver) - goto err_ret; - - if (!try_module_get(client->dev.driver->owner)) - goto err_i2c; - - if (!ci->en) - goto err_i2c; + client = dvb_module_probe("cxd2099", NULL, + &dev->channel[0].i2c_adapter, + 0x40, &cxd_cfg); + if (!client) + goto err; ci->dev = dev; dev->channel[0].i2c_client[0] = client; return; -err_i2c: - i2c_unregister_device(client); -err_ret: +err: dev_err(pdev, "CXD2099AR attach failed\n"); return; } @@ -1632,16 +1614,11 @@ err_ret: static void cxd_detach(struct ngene *dev) { struct ngene_ci *ci = &dev->ci; - struct i2c_client *client; dvb_ca_en50221_release(ci->en); - client = dev->channel[0].i2c_client[0]; - if (client) { - module_put(client->dev.driver->owner); - i2c_unregister_device(client); - } - + dvb_module_release(dev->channel[0].i2c_client[0]); + dev->channel[0].i2c_client[0] = NULL; ci->en = NULL; } |