lkml.org 
[lkml]   [2019]   [Nov]   [6]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 13/17] media: usb: dvb-usb-v2: rtl28xxu: convert to use i2c_new_client_device()
    Date
    Use the newer API returning an ERRPTR and use the new helper to bail
    out.

    Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
    ---
    drivers/media/usb/dvb-usb-v2/rtl28xxu.c | 36 ++++++++++++-------------
    1 file changed, 18 insertions(+), 18 deletions(-)

    diff --git a/drivers/media/usb/dvb-usb-v2/rtl28xxu.c b/drivers/media/usb/dvb-usb-v2/rtl28xxu.c
    index 5016ede7b35f..3a4eb992024a 100644
    --- a/drivers/media/usb/dvb-usb-v2/rtl28xxu.c
    +++ b/drivers/media/usb/dvb-usb-v2/rtl28xxu.c
    @@ -697,8 +697,8 @@ static int rtl2831u_frontend_attach(struct dvb_usb_adapter *adap)
    board_info.addr = 0x10;
    board_info.platform_data = pdata;
    request_module("%s", board_info.type);
    - client = i2c_new_device(&d->i2c_adap, &board_info);
    - if (client == NULL || client->dev.driver == NULL) {
    + client = i2c_new_client_device(&d->i2c_adap, &board_info);
    + if (!i2c_client_has_driver(client)) {
    ret = -ENODEV;
    goto err;
    }
    @@ -918,8 +918,8 @@ static int rtl2832u_frontend_attach(struct dvb_usb_adapter *adap)
    board_info.addr = 0x10;
    board_info.platform_data = pdata;
    request_module("%s", board_info.type);
    - client = i2c_new_device(&d->i2c_adap, &board_info);
    - if (client == NULL || client->dev.driver == NULL) {
    + client = i2c_new_client_device(&d->i2c_adap, &board_info);
    + if (!i2c_client_has_driver(client)) {
    ret = -ENODEV;
    goto err;
    }
    @@ -960,8 +960,8 @@ static int rtl2832u_frontend_attach(struct dvb_usb_adapter *adap)
    info.addr = 0x18;
    info.platform_data = &mn88472_config;
    request_module(info.type);
    - client = i2c_new_device(&d->i2c_adap, &info);
    - if (client == NULL || client->dev.driver == NULL) {
    + client = i2c_new_client_device(&d->i2c_adap, &info);
    + if (!i2c_client_has_driver(client)) {
    dev->slave_demod = SLAVE_DEMOD_NONE;
    goto err_slave_demod_failed;
    }
    @@ -982,8 +982,8 @@ static int rtl2832u_frontend_attach(struct dvb_usb_adapter *adap)
    info.addr = 0x18;
    info.platform_data = &mn88473_config;
    request_module(info.type);
    - client = i2c_new_device(&d->i2c_adap, &info);
    - if (client == NULL || client->dev.driver == NULL) {
    + client = i2c_new_client_device(&d->i2c_adap, &info);
    + if (!i2c_client_has_driver(client)) {
    dev->slave_demod = SLAVE_DEMOD_NONE;
    goto err_slave_demod_failed;
    }
    @@ -1025,8 +1025,8 @@ static int rtl2832u_frontend_attach(struct dvb_usb_adapter *adap)
    info.addr = 0x64;
    info.platform_data = &si2168_config;
    request_module(info.type);
    - client = i2c_new_device(&d->i2c_adap, &info);
    - if (client == NULL || client->dev.driver == NULL) {
    + client = i2c_new_client_device(&d->i2c_adap, &info);
    + if (!i2c_client_has_driver(client)) {
    dev->slave_demod = SLAVE_DEMOD_NONE;
    goto err_slave_demod_failed;
    }
    @@ -1217,8 +1217,8 @@ static int rtl2832u_tuner_attach(struct dvb_usb_adapter *adap)
    info.platform_data = &e4000_config;

    request_module(info.type);
    - client = i2c_new_device(dev->demod_i2c_adapter, &info);
    - if (client == NULL || client->dev.driver == NULL)
    + client = i2c_new_client_device(dev->demod_i2c_adapter, &info);
    + if (!i2c_client_has_driver(client))
    break;

    if (!try_module_get(client->dev.driver->owner)) {
    @@ -1240,9 +1240,9 @@ static int rtl2832u_tuner_attach(struct dvb_usb_adapter *adap)
    board_info.addr = 0x56;
    board_info.platform_data = &fc2580_pdata;
    request_module("fc2580");
    - client = i2c_new_device(dev->demod_i2c_adapter,
    + client = i2c_new_client_device(dev->demod_i2c_adapter,
    &board_info);
    - if (client == NULL || client->dev.driver == NULL)
    + if (!i2c_client_has_driver(client))
    break;
    if (!try_module_get(client->dev.driver->owner)) {
    i2c_unregister_device(client);
    @@ -1271,8 +1271,8 @@ static int rtl2832u_tuner_attach(struct dvb_usb_adapter *adap)
    board_info.addr = 0x60;
    board_info.platform_data = &tua9001_pdata;
    request_module("tua9001");
    - client = i2c_new_device(dev->demod_i2c_adapter, &board_info);
    - if (client == NULL || client->dev.driver == NULL)
    + client = i2c_new_client_device(dev->demod_i2c_adapter, &board_info);
    + if (!i2c_client_has_driver(client))
    break;
    if (!try_module_get(client->dev.driver->owner)) {
    i2c_unregister_device(client);
    @@ -1316,8 +1316,8 @@ static int rtl2832u_tuner_attach(struct dvb_usb_adapter *adap)
    info.addr = 0x60;
    info.platform_data = &si2157_config;
    request_module(info.type);
    - client = i2c_new_device(&d->i2c_adap, &info);
    - if (client == NULL || client->dev.driver == NULL)
    + client = i2c_new_client_device(&d->i2c_adap, &info);
    + if (!i2c_client_has_driver(client))
    break;

    if (!try_module_get(client->dev.driver->owner)) {
    --
    2.20.1
    \
     
     \ /
      Last update: 2019-11-06 22:23    [W:5.365 / U:0.132 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site