media: usb: dvb-usb: dib0700_devices: convert to use i2c_new_client_device()

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>
Signed-off-by: Sean Young <sean@mess.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>

diff --git a/drivers/media/usb/dvb-usb/dib0700_devices.c b/drivers/media/usb/dvb-usb/dib0700_devices.c
index ab7a100..4ef3fa9 100644 (file)
--- a/drivers/media/usb/dvb-usb/dib0700_devices.c
+++ b/drivers/media/usb/dvb-usb/dib0700_devices.c
@@ -3772,8 +3772,8 @@ static int xbox_one_attach(struct dvb_usb_adapter *adap)
        info.addr = 0x18;
        info.platform_data = &mn88472_config;
        request_module(info.type);
-       client_demod = i2c_new_device(&d->i2c_adap, &info);
-       if (client_demod == NULL || client_demod->dev.driver == NULL)
+       client_demod = i2c_new_client_device(&d->i2c_adap, &info);
+       if (!i2c_client_has_driver(client_demod))
                goto fail_demod_device;
        if (!try_module_get(client_demod->dev.driver->owner))
                goto fail_demod_module;
@@ -3800,8 +3800,8 @@ static int xbox_one_attach(struct dvb_usb_adapter *adap)
        info.platform_data = &tda18250_config;
 
        request_module(info.type);
-       client_tuner = i2c_new_device(&adap->dev->i2c_adap, &info);
-       if (client_tuner == NULL || client_tuner->dev.driver == NULL)
+       client_tuner = i2c_new_client_device(&adap->dev->i2c_adap, &info);
+       if (!i2c_client_has_driver(client_tuner))
                goto fail_tuner_device;
        if (!try_module_get(client_tuner->dev.driver->owner))
                goto fail_tuner_module;