From: Wolfram Sang <wsa+renesas@sang-engineering.com>
To: linux-i2c@vger.kernel.org
Cc: Wolfram Sang <wsa+renesas@sang-engineering.com>,
Andy Walls <awalls@md.metrocast.net>,
Mauro Carvalho Chehab <mchehab@kernel.org>,
linux-media@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [RFC PATCH 11/12] media: pci: ivtv: convert to i2c_new_scanned_device
Date: Wed, 6 Nov 2019 10:50:29 +0100 [thread overview]
Message-ID: <20191106095033.25182-12-wsa+renesas@sang-engineering.com> (raw)
In-Reply-To: <20191106095033.25182-1-wsa+renesas@sang-engineering.com>
Move from the deprecated i2c_new_probed_device() to the new
i2c_new_scanned_device(). Make use of the new ERRPTR if suitable. Change
the legacy function to simply return void because the retval was never
used anywhere.
Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
---
Build tested only. RFC, please comment and/or ack, but don't apply yet.
drivers/media/pci/ivtv/ivtv-i2c.c | 6 +++---
drivers/media/pci/ivtv/ivtv-i2c.h | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/media/pci/ivtv/ivtv-i2c.c b/drivers/media/pci/ivtv/ivtv-i2c.c
index 0772d757a389..982045c4eea8 100644
--- a/drivers/media/pci/ivtv/ivtv-i2c.c
+++ b/drivers/media/pci/ivtv/ivtv-i2c.c
@@ -208,12 +208,12 @@ static int ivtv_i2c_new_ir(struct ivtv *itv, u32 hw, const char *type, u8 addr)
info.platform_data = init_data;
strscpy(info.type, type, I2C_NAME_SIZE);
- return i2c_new_probed_device(adap, &info, addr_list, NULL) == NULL ?
+ return IS_ERR(i2c_new_scanned_device(adap, &info, addr_list, NULL)) ?
-1 : 0;
}
/* Instantiate the IR receiver device using probing -- undesirable */
-struct i2c_client *ivtv_i2c_new_ir_legacy(struct ivtv *itv)
+void ivtv_i2c_new_ir_legacy(struct ivtv *itv)
{
struct i2c_board_info info;
/*
@@ -235,7 +235,7 @@ struct i2c_client *ivtv_i2c_new_ir_legacy(struct ivtv *itv)
memset(&info, 0, sizeof(struct i2c_board_info));
strscpy(info.type, "ir_video", I2C_NAME_SIZE);
- return i2c_new_probed_device(&itv->i2c_adap, &info, addr_list, NULL);
+ i2c_new_scanned_device(&itv->i2c_adap, &info, addr_list, NULL);
}
int ivtv_i2c_register(struct ivtv *itv, unsigned idx)
diff --git a/drivers/media/pci/ivtv/ivtv-i2c.h b/drivers/media/pci/ivtv/ivtv-i2c.h
index 462f73449a6e..2d9cdaa682c5 100644
--- a/drivers/media/pci/ivtv/ivtv-i2c.h
+++ b/drivers/media/pci/ivtv/ivtv-i2c.h
@@ -9,7 +9,7 @@
#ifndef IVTV_I2C_H
#define IVTV_I2C_H
-struct i2c_client *ivtv_i2c_new_ir_legacy(struct ivtv *itv);
+void ivtv_i2c_new_ir_legacy(struct ivtv *itv);
int ivtv_i2c_register(struct ivtv *itv, unsigned idx);
struct v4l2_subdev *ivtv_find_hw(struct ivtv *itv, u32 hw);
--
2.20.1
next prev parent reply other threads:[~2019-11-06 9:51 UTC|newest]
Thread overview: 47+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-06 9:50 [RFC PATCH 00/12] i2c: replace i2c_new_probed_device with an ERR_PTR variant Wolfram Sang
2019-11-06 9:50 ` Wolfram Sang
2019-11-06 9:50 ` Wolfram Sang
2019-11-06 9:50 ` Wolfram Sang
2019-11-06 9:50 ` [RFC PATCH 01/12] " Wolfram Sang
2019-11-06 12:39 ` Max Staudt
2019-11-07 17:31 ` Luca Ceresoli
2019-11-07 19:22 ` Wolfram Sang
2019-11-08 8:01 ` Luca Ceresoli
2019-11-28 16:16 ` Wolfram Sang
2019-11-06 9:50 ` [RFC PATCH 02/12] i2c: icy: convert to i2c_new_scanned_device Wolfram Sang
2019-11-06 11:33 ` Max Staudt
2019-11-28 16:16 ` Wolfram Sang
2019-11-06 9:50 ` [RFC PATCH 03/12] macintosh: " Wolfram Sang
2019-11-06 9:50 ` Wolfram Sang
2019-11-06 9:50 ` [RFC PATCH 04/12] platform: chrome: " Wolfram Sang
2019-11-06 9:50 ` [RFC PATCH 05/12] video: fbdev: matrox: " Wolfram Sang
2019-11-06 9:50 ` Wolfram Sang
2019-11-06 9:50 ` Wolfram Sang
2019-11-07 8:33 ` Daniel Vetter
2019-11-07 8:33 ` Daniel Vetter
2019-11-07 8:33 ` Daniel Vetter
2019-11-28 16:18 ` Wolfram Sang
2019-11-28 16:18 ` Wolfram Sang
2019-11-28 16:18 ` Wolfram Sang
2019-11-28 16:19 ` Wolfram Sang
2019-11-28 16:19 ` Wolfram Sang
2019-11-28 16:19 ` Wolfram Sang
2019-11-06 9:50 ` [RFC PATCH 06/12] input: mouse: " Wolfram Sang
2019-11-11 18:19 ` Dmitry Torokhov
2019-11-06 9:50 ` [RFC PATCH 07/12] media: pci: cx23885: " Wolfram Sang
2019-11-06 11:18 ` Hans Verkuil
2019-11-06 9:50 ` [RFC PATCH 08/12] media: pci: cx88: " Wolfram Sang
2019-11-06 11:18 ` Hans Verkuil
2019-11-06 14:49 ` Wolfram Sang
2019-11-06 9:50 ` [RFC PATCH 09/12] media: pci: bt8xx: " Wolfram Sang
2019-11-06 11:19 ` Hans Verkuil
2019-11-06 9:50 ` [RFC PATCH 10/12] media: pci: cx18: " Wolfram Sang
2019-11-06 11:23 ` Hans Verkuil
2019-11-06 9:50 ` Wolfram Sang [this message]
2019-11-06 11:21 ` [RFC PATCH 11/12] media: pci: ivtv: " Hans Verkuil
2019-11-06 9:50 ` [RFC PATCH 12/12] media: v4l2-core: " Wolfram Sang
2019-11-06 11:24 ` Hans Verkuil
2019-11-06 10:06 ` [RFC PATCH 00/12] i2c: replace i2c_new_probed_device with an ERR_PTR variant Sean Young
2019-11-06 10:06 ` Sean Young
2019-11-06 10:06 ` Sean Young
2019-11-06 10:06 ` Sean Young
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=20191106095033.25182-12-wsa+renesas@sang-engineering.com \
--to=wsa+renesas@sang-engineering.com \
--cc=awalls@md.metrocast.net \
--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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.