From: Wolfram Sang <wsa+renesas@sang-engineering.com>
Date: Mon, 16 Dec 2019 15:51:35 +0000 (+0100)
Subject: media: pci: smipcie: smipcie-main: convert to use i2c_new_client_device()
X-Git-Tag: v5.6-rc1~93^2~28
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=32dc63f6915d7a3b80fbe7f2c93582ec12a7ae61;p=linux-block.git

media: pci: smipcie: smipcie-main: 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/pci/smipcie/smipcie-main.c b/drivers/media/pci/smipcie/smipcie-main.c
index 1fb78462e081..9ca0fc3e6f80 100644
--- a/drivers/media/pci/smipcie/smipcie-main.c
+++ b/drivers/media/pci/smipcie/smipcie-main.c
@@ -484,8 +484,8 @@ static struct i2c_client *smi_add_i2c_client(struct i2c_adapter *adapter,
 	struct i2c_client *client;
 
 	request_module(info->type);
-	client = i2c_new_device(adapter, info);
-	if (client == NULL || client->dev.driver == NULL)
+	client = i2c_new_client_device(adapter, info);
+	if (!i2c_client_has_driver(client))
 		goto err_add_i2c_client;
 
 	if (!try_module_get(client->dev.driver->owner)) {