media: usb: hdpvr: convert to use i2c_new_client_device()

Move away from the deprecated API and return the shiny new ERRPTR where
useful.

Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>

diff --git a/drivers/media/usb/hdpvr/hdpvr-core.c b/drivers/media/usb/hdpvr/hdpvr-core.c
index b75c18a012a7302d8878a5446d0b7277440f07aa..52e05a69c46eeceaa1c52a2d581fd489a53bd0d2 100644 (file)
--- a/drivers/media/usb/hdpvr/hdpvr-core.c
+++ b/drivers/media/usb/hdpvr/hdpvr-core.c
@@ -363,9 +363,9 @@ static int hdpvr_probe(struct usb_interface *interface,
        }
 
        client = hdpvr_register_ir_i2c(dev);
-       if (!client) {
+       if (IS_ERR(client)) {
                v4l2_err(&dev->v4l2_dev, "i2c IR device register failed\n");
-               retval = -ENODEV;
+               retval = PTR_ERR(client);
                goto reg_fail;
        }
 #endif

diff --git a/drivers/media/usb/hdpvr/hdpvr-i2c.c b/drivers/media/usb/hdpvr/hdpvr-i2c.c
index 785c8508a46e5a989ec7f81af97dea3d0d9c05e9..070559b01b01b81c7acb40dd4b57adeebdd7b48b 100644 (file)
--- a/drivers/media/usb/hdpvr/hdpvr-i2c.c
+++ b/drivers/media/usb/hdpvr/hdpvr-i2c.c
@@ -44,7 +44,7 @@ struct i2c_client *hdpvr_register_ir_i2c(struct hdpvr_device *dev)
        init_data->polling_interval = 405; /* ms, duplicated from Windows */
        info.platform_data = init_data;
 
-       return i2c_new_device(&dev->i2c_adapter, &info);
+       return i2c_new_client_device(&dev->i2c_adapter, &info);
 }
 
 static int hdpvr_i2c_read(struct hdpvr_device *dev, int bus,