Skip to content

Commit 99240e3

Browse files
media: platform: dwc: rename v4l2_async_subdev as v4l2_async_connection
Rename v4l2_async_subdev as v4l2_async_connection in order to diffentiate between the sub-devices and their connections. Signed-off-by: Balamanikandan Gunasundar <balamanikandan.gunasundar@microchip.com>
1 parent dd16129 commit 99240e3

1 file changed

Lines changed: 9 additions & 9 deletions

File tree

drivers/media/platform/dwc/dw-csi-plat.c

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -303,7 +303,7 @@ static irqreturn_t dw_mipi_csi_irq1(int irq, void *dev_id)
303303

304304
static int dw_async_bound(struct v4l2_async_notifier *notifier,
305305
struct v4l2_subdev *subdev,
306-
struct v4l2_async_subdev *asd)
306+
struct v4l2_async_connection *asc)
307307
{
308308
struct dw_csi *dw = container_of(notifier,
309309
struct dw_csi, notifier);
@@ -314,7 +314,7 @@ static int dw_async_bound(struct v4l2_async_notifier *notifier,
314314
dw->input_sd = subdev;
315315

316316
pad = media_entity_get_fwnode_pad(&subdev->entity,
317-
asd->match.fwnode,
317+
asc->match.fwnode,
318318
MEDIA_PAD_FL_SOURCE);
319319
if (pad < 0) {
320320
dev_err(dw->dev, "Failed to find pad for %s\n",
@@ -351,7 +351,7 @@ dw_mipi_csi_parse_dt(struct platform_device *pdev, struct dw_csi *dev)
351351
struct fwnode_handle *input_fwnode, *output_fwnode;
352352
struct v4l2_fwnode_endpoint ep = { .bus_type = V4L2_MBUS_CSI2_DPHY };
353353
struct v4l2_fwnode_endpoint ep2 = { };
354-
struct v4l2_async_subdev *asd;
354+
struct v4l2_async_connection *asc;
355355
int ret = 0;
356356

357357
if (of_property_read_u32(of_node, "snps,output-type",
@@ -394,12 +394,12 @@ dw_mipi_csi_parse_dt(struct platform_device *pdev, struct dw_csi *dev)
394394
"missing output node at %pOF\n", of_node);
395395
}
396396

397-
v4l2_async_nf_init(&dev->notifier);
398-
asd = v4l2_async_nf_add_fwnode_remote(&dev->notifier, input_fwnode,
399-
struct v4l2_async_subdev);
397+
v4l2_async_subdev_nf_init(&dev->notifier, &dev->sd);
398+
asc = v4l2_async_nf_add_fwnode_remote(&dev->notifier, input_fwnode,
399+
struct v4l2_async_connection);
400400

401-
if (IS_ERR(asd)) {
402-
ret = PTR_ERR(asd);
401+
if (IS_ERR(asc)) {
402+
ret = PTR_ERR(asc);
403403
goto err;
404404
}
405405

@@ -410,7 +410,7 @@ dw_mipi_csi_parse_dt(struct platform_device *pdev, struct dw_csi *dev)
410410

411411
dev->notifier.ops = &csi2host_async_ops;
412412

413-
ret = v4l2_async_subdev_nf_register(&dev->sd, &dev->notifier);
413+
ret = v4l2_async_nf_register(&dev->notifier);
414414

415415
if (ret) {
416416
dev_err(&pdev->dev, "fail to register async notifier.\n");

0 commit comments

Comments
 (0)