* [PATCH 0/5] media: replace i2c_new_probed_device with an ERR_PTR variant
@ 2019-12-16 12:29 Wolfram Sang
2019-12-16 12:29 ` [PATCH 1/5] media: pci: cx23885: convert to i2c_new_scanned_device Wolfram Sang
` (4 more replies)
0 siblings, 5 replies; 6+ messages in thread
From: Wolfram Sang @ 2019-12-16 12:29 UTC (permalink / raw)
To: linux-i2c; +Cc: Wolfram Sang, linux-kernel, linux-media
In the on-going mission to let i2c_new_* calls return an ERR_PTR instead of
NULL, here is a series for this subsystem converting i2c_new_probed_device() to
the newly introduced i2c_new_scanned_device(). Based on v5.5-rc1 and build tested.
Please apply via your tree.
Thanks,
Wolfram
Changes since RFC:
* changed commit message of cx88 patch to match the change
(Thanks Hans!)
* added acks (Thanks Hans and Sean!)
* rebased to v5.5-rc1
Wolfram Sang (5):
media: pci: cx23885: convert to i2c_new_scanned_device
media: pci: cx88: convert to i2c_new_scanned_device
media: pci: bt8xx: convert to i2c_new_scanned_device
media: pci: cx18: convert to i2c_new_scanned_device
media: pci: ivtv: convert to i2c_new_scanned_device
drivers/media/pci/bt8xx/bttv-input.c | 6 +++---
drivers/media/pci/cx18/cx18-i2c.c | 2 +-
drivers/media/pci/cx23885/cx23885-i2c.c | 4 ++--
drivers/media/pci/cx88/cx88-input.c | 2 +-
drivers/media/pci/ivtv/ivtv-i2c.c | 6 +++---
drivers/media/pci/ivtv/ivtv-i2c.h | 2 +-
6 files changed, 11 insertions(+), 11 deletions(-)
--
2.20.1
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH 1/5] media: pci: cx23885: convert to i2c_new_scanned_device
2019-12-16 12:29 [PATCH 0/5] media: replace i2c_new_probed_device with an ERR_PTR variant Wolfram Sang
@ 2019-12-16 12:29 ` Wolfram Sang
2019-12-16 12:29 ` [PATCH 2/5] media: pci: cx88: " Wolfram Sang
` (3 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: Wolfram Sang @ 2019-12-16 12:29 UTC (permalink / raw)
To: linux-i2c
Cc: Wolfram Sang, Hans Verkuil, Sean Young, Mauro Carvalho Chehab,
linux-media, linux-kernel
Move from the deprecated i2c_new_probed_device() to the new
i2c_new_scanned_device(). Make use of the new ERRPTR if suitable.
Acked-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Acked-by: Sean Young <sean@mess.org>
Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
---
Build tested only.
drivers/media/pci/cx23885/cx23885-i2c.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/media/pci/cx23885/cx23885-i2c.c b/drivers/media/pci/cx23885/cx23885-i2c.c
index 4f327ee9659e..f51fad33dc04 100644
--- a/drivers/media/pci/cx23885/cx23885-i2c.c
+++ b/drivers/media/pci/cx23885/cx23885-i2c.c
@@ -337,8 +337,8 @@ int cx23885_i2c_register(struct cx23885_i2c *bus)
strscpy(info.type, "ir_video", I2C_NAME_SIZE);
/* Use quick read command for probe, some IR chips don't
* support writes */
- i2c_new_probed_device(&bus->i2c_adap, &info, addr_list,
- i2c_probe_func_quick_read);
+ i2c_new_scanned_device(&bus->i2c_adap, &info, addr_list,
+ i2c_probe_func_quick_read);
}
return bus->i2c_rc;
--
2.20.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 2/5] media: pci: cx88: convert to i2c_new_scanned_device
2019-12-16 12:29 [PATCH 0/5] media: replace i2c_new_probed_device with an ERR_PTR variant Wolfram Sang
2019-12-16 12:29 ` [PATCH 1/5] media: pci: cx23885: convert to i2c_new_scanned_device Wolfram Sang
@ 2019-12-16 12:29 ` Wolfram Sang
2019-12-16 12:29 ` [PATCH 3/5] media: pci: bt8xx: " Wolfram Sang
` (2 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: Wolfram Sang @ 2019-12-16 12:29 UTC (permalink / raw)
To: linux-i2c
Cc: Wolfram Sang, Hans Verkuil, Sean Young, Mauro Carvalho Chehab,
linux-media, linux-kernel
Here, this only means to update a comment in the driver.
Acked-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Acked-by: Sean Young <sean@mess.org>
Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
---
Build tested only.
drivers/media/pci/cx88/cx88-input.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/media/pci/cx88/cx88-input.c b/drivers/media/pci/cx88/cx88-input.c
index 589f52d961eb..c7c2acd55266 100644
--- a/drivers/media/pci/cx88/cx88-input.c
+++ b/drivers/media/pci/cx88/cx88-input.c
@@ -613,7 +613,7 @@ void cx88_i2c_init_ir(struct cx88_core *core)
}
/*
- * We can't call i2c_new_probed_device() because it uses
+ * We can't call i2c_new_scanned_device() because it uses
* quick writes for probing and at least some RC receiver
* devices only reply to reads.
* Also, Hauppauge XVR needs to be specified, as address 0x71
--
2.20.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 3/5] media: pci: bt8xx: convert to i2c_new_scanned_device
2019-12-16 12:29 [PATCH 0/5] media: replace i2c_new_probed_device with an ERR_PTR variant Wolfram Sang
2019-12-16 12:29 ` [PATCH 1/5] media: pci: cx23885: convert to i2c_new_scanned_device Wolfram Sang
2019-12-16 12:29 ` [PATCH 2/5] media: pci: cx88: " Wolfram Sang
@ 2019-12-16 12:29 ` Wolfram Sang
2019-12-16 12:29 ` [PATCH 4/5] media: pci: cx18: " Wolfram Sang
2019-12-16 12:29 ` [PATCH 5/5] media: pci: ivtv: " Wolfram Sang
4 siblings, 0 replies; 6+ messages in thread
From: Wolfram Sang @ 2019-12-16 12:29 UTC (permalink / raw)
To: linux-i2c
Cc: Wolfram Sang, Hans Verkuil, Sean Young, Mauro Carvalho Chehab,
linux-media, linux-kernel
Move from the deprecated i2c_new_probed_device() to the new
i2c_new_scanned_device(). Make use of the new ERRPTR if suitable.
Acked-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Acked-by: Sean Young <sean@mess.org>
Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
---
Build tested only.
drivers/media/pci/bt8xx/bttv-input.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/media/pci/bt8xx/bttv-input.c b/drivers/media/pci/bt8xx/bttv-input.c
index 492bc85c2700..41226f1d0e5b 100644
--- a/drivers/media/pci/bt8xx/bttv-input.c
+++ b/drivers/media/pci/bt8xx/bttv-input.c
@@ -386,7 +386,7 @@ void init_bttv_i2c_ir(struct bttv *btv)
if (btv->init_data.name) {
info.platform_data = &btv->init_data;
- i2c_dev = i2c_new_device(&btv->c.i2c_adap, &info);
+ i2c_dev = i2c_new_client_device(&btv->c.i2c_adap, &info);
} else {
/*
* The external IR receiver is at i2c address 0x34 (0x35 for
@@ -396,9 +396,9 @@ void init_bttv_i2c_ir(struct bttv *btv)
* internal.
* That's why we probe 0x1a (~0x34) first. CB
*/
- i2c_dev = i2c_new_probed_device(&btv->c.i2c_adap, &info, addr_list, NULL);
+ i2c_dev = i2c_new_scanned_device(&btv->c.i2c_adap, &info, addr_list, NULL);
}
- if (NULL == i2c_dev)
+ if (IS_ERR(i2c_dev))
return;
#if defined(CONFIG_MODULES) && defined(MODULE)
--
2.20.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 4/5] media: pci: cx18: convert to i2c_new_scanned_device
2019-12-16 12:29 [PATCH 0/5] media: replace i2c_new_probed_device with an ERR_PTR variant Wolfram Sang
` (2 preceding siblings ...)
2019-12-16 12:29 ` [PATCH 3/5] media: pci: bt8xx: " Wolfram Sang
@ 2019-12-16 12:29 ` Wolfram Sang
2019-12-16 12:29 ` [PATCH 5/5] media: pci: ivtv: " Wolfram Sang
4 siblings, 0 replies; 6+ messages in thread
From: Wolfram Sang @ 2019-12-16 12:29 UTC (permalink / raw)
To: linux-i2c
Cc: Wolfram Sang, Hans Verkuil, Sean Young, Andy Walls,
Mauro Carvalho Chehab, linux-media, linux-kernel
Move from the deprecated i2c_new_probed_device() to the new
i2c_new_scanned_device(). Make use of the new ERRPTR if suitable.
Acked-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Acked-by: Sean Young <sean@mess.org>
Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
---
Build tested only.
drivers/media/pci/cx18/cx18-i2c.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/media/pci/cx18/cx18-i2c.c b/drivers/media/pci/cx18/cx18-i2c.c
index 1ef7ccf4a722..a83435245251 100644
--- a/drivers/media/pci/cx18/cx18-i2c.c
+++ b/drivers/media/pci/cx18/cx18-i2c.c
@@ -88,7 +88,7 @@ static int cx18_i2c_new_ir(struct cx18 *cx, struct i2c_adapter *adap, u32 hw,
break;
}
- 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;
}
--
2.20.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 5/5] media: pci: ivtv: convert to i2c_new_scanned_device
2019-12-16 12:29 [PATCH 0/5] media: replace i2c_new_probed_device with an ERR_PTR variant Wolfram Sang
` (3 preceding siblings ...)
2019-12-16 12:29 ` [PATCH 4/5] media: pci: cx18: " Wolfram Sang
@ 2019-12-16 12:29 ` Wolfram Sang
4 siblings, 0 replies; 6+ messages in thread
From: Wolfram Sang @ 2019-12-16 12:29 UTC (permalink / raw)
To: linux-i2c
Cc: Wolfram Sang, Hans Verkuil, Sean Young, Andy Walls,
Mauro Carvalho Chehab, linux-media, linux-kernel
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.
Acked-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Acked-by: Sean Young <sean@mess.org>
Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
---
Build tested only.
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
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2019-12-16 12:30 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-12-16 12:29 [PATCH 0/5] media: replace i2c_new_probed_device with an ERR_PTR variant Wolfram Sang
2019-12-16 12:29 ` [PATCH 1/5] media: pci: cx23885: convert to i2c_new_scanned_device Wolfram Sang
2019-12-16 12:29 ` [PATCH 2/5] media: pci: cx88: " Wolfram Sang
2019-12-16 12:29 ` [PATCH 3/5] media: pci: bt8xx: " Wolfram Sang
2019-12-16 12:29 ` [PATCH 4/5] media: pci: cx18: " Wolfram Sang
2019-12-16 12:29 ` [PATCH 5/5] media: pci: ivtv: " Wolfram Sang
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).