From: Wolfram Sang <wsa+renesas@sang-engineering.com>
To: linux-media@vger.kernel.org
Cc: linux-i2c@vger.kernel.org,
Wolfram Sang <wsa+renesas@sang-engineering.com>,
Mauro Carvalho Chehab <mchehab@kernel.org>,
linux-kernel@vger.kernel.org
Subject: [PATCH 08/17] media: pci: saa7164: saa7164-dvb: convert to use i2c_new_client_device()
Date: Wed, 6 Nov 2019 22:21:08 +0100 [thread overview]
Message-ID: <20191106212120.27983-9-wsa+renesas@sang-engineering.com> (raw)
In-Reply-To: <20191106212120.27983-1-wsa+renesas@sang-engineering.com>
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/pci/saa7164/saa7164-dvb.c | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/drivers/media/pci/saa7164/saa7164-dvb.c b/drivers/media/pci/saa7164/saa7164-dvb.c
index 05ab4734ea67..6a527dbc1daf 100644
--- a/drivers/media/pci/saa7164/saa7164-dvb.c
+++ b/drivers/media/pci/saa7164/saa7164-dvb.c
@@ -116,8 +116,8 @@ static int si2157_attach(struct saa7164_port *port, struct i2c_adapter *adapter,
request_module(bi.type);
- tuner = i2c_new_device(adapter, &bi);
- if (tuner == NULL || tuner->dev.driver == NULL)
+ tuner = i2c_new_client_device(adapter, &bi);
+ if (!i2c_client_has_driver(tuner))
return -ENODEV;
if (!try_module_get(tuner->dev.driver->owner)) {
@@ -637,9 +637,9 @@ int saa7164_dvb_register(struct saa7164_port *port)
info.addr = 0xc8 >> 1;
info.platform_data = &si2168_config;
request_module(info.type);
- client_demod = i2c_new_device(&dev->i2c_bus[2].i2c_adap,
+ client_demod = i2c_new_client_device(&dev->i2c_bus[2].i2c_adap,
&info);
- if (!client_demod || !client_demod->dev.driver)
+ if (!i2c_client_has_driver(client_demod))
goto frontend_detach;
if (!try_module_get(client_demod->dev.driver->owner)) {
@@ -657,9 +657,9 @@ int saa7164_dvb_register(struct saa7164_port *port)
info.addr = 0xc0 >> 1;
info.platform_data = &si2157_config;
request_module(info.type);
- client_tuner = i2c_new_device(&dev->i2c_bus[0].i2c_adap,
+ client_tuner = i2c_new_client_device(&dev->i2c_bus[0].i2c_adap,
&info);
- if (!client_tuner || !client_tuner->dev.driver) {
+ if (!i2c_client_has_driver(client_tuner)) {
module_put(client_demod->dev.driver->owner);
i2c_unregister_device(client_demod);
goto frontend_detach;
@@ -682,9 +682,9 @@ int saa7164_dvb_register(struct saa7164_port *port)
info.addr = 0xcc >> 1;
info.platform_data = &si2168_config;
request_module(info.type);
- client_demod = i2c_new_device(&dev->i2c_bus[2].i2c_adap,
+ client_demod = i2c_new_client_device(&dev->i2c_bus[2].i2c_adap,
&info);
- if (!client_demod || !client_demod->dev.driver)
+ if (!i2c_client_has_driver(client_demod))
goto frontend_detach;
if (!try_module_get(client_demod->dev.driver->owner)) {
@@ -702,9 +702,9 @@ int saa7164_dvb_register(struct saa7164_port *port)
info.addr = 0xc0 >> 1;
info.platform_data = &si2157_config;
request_module(info.type);
- client_tuner = i2c_new_device(&dev->i2c_bus[1].i2c_adap,
+ client_tuner = i2c_new_client_device(&dev->i2c_bus[1].i2c_adap,
&info);
- if (!client_tuner || !client_tuner->dev.driver) {
+ if (!i2c_client_has_driver(client_tuner)) {
module_put(client_demod->dev.driver->owner);
i2c_unregister_device(client_demod);
goto frontend_detach;
--
2.20.1
next prev parent reply other threads:[~2019-11-06 21:21 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-06 21:21 [PATCH 00/17] media: use new API for creating client devices Wolfram Sang
2019-11-06 21:21 ` [PATCH 01/17] i2c: add helper to check if a client has a driver attached Wolfram Sang
2019-12-11 7:59 ` Wolfram Sang
2019-11-06 21:21 ` [PATCH 02/17] media: dvb-core: dvbdev: convert to use i2c_new_client_device() Wolfram Sang
2019-11-06 21:21 ` [PATCH 03/17] media: dvb-frontends: cxd2820r_core: " Wolfram Sang
2019-11-06 21:21 ` [PATCH 04/17] media: dvb-frontends: lgdt330x: " Wolfram Sang
2019-11-06 21:21 ` [PATCH 05/17] media: dvb-frontends: m88ds3103: " Wolfram Sang
2019-11-06 21:21 ` [PATCH 06/17] media: dvb-frontends: ts2020: " Wolfram Sang
2019-11-06 21:21 ` [PATCH 07/17] media: pci: cx23885: cx23885-dvb: " Wolfram Sang
2019-11-06 21:21 ` Wolfram Sang [this message]
2019-11-06 21:21 ` [PATCH 09/17] media: pci: smipcie: smipcie-main: " Wolfram Sang
2019-11-06 21:21 ` [PATCH 10/17] media: platform: sti: c8sectpfe: c8sectpfe-dvb: " Wolfram Sang
2019-11-07 9:59 ` Patrice CHOTARD
2019-11-06 21:21 ` [PATCH 11/17] media: usb: dvb-usb-v2: af9035: " Wolfram Sang
2019-11-06 21:21 ` [PATCH 12/17] media: usb: dvb-usb-v2: anysee: " Wolfram Sang
2019-11-06 21:21 ` [PATCH 13/17] media: usb: dvb-usb-v2: rtl28xxu: " Wolfram Sang
2019-11-06 21:21 ` [PATCH 14/17] media: usb: dvb-usb-v2: zd1301: " Wolfram Sang
2019-11-06 21:21 ` [PATCH 15/17] media: usb: dvb-usb: dib0700_devices: " Wolfram Sang
2019-11-06 21:21 ` [PATCH 16/17] media: usb: dvb-usb: dw2102: " Wolfram Sang
2019-11-06 21:21 ` [PATCH 17/17] media: v4l2-core: v4l2-i2c: " Wolfram Sang
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20191106212120.27983-9-wsa+renesas@sang-engineering.com \
--to=wsa+renesas@sang-engineering.com \
--cc=linux-i2c@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=mchehab@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).