UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

media: rcar-vin: Specify media device ops at group creation time 

The media device operations structure will be different depending on
what media graph layout is used. Instead of hard-coding the R-Car CSI-2
layout allow the operations to be passed as an argument.

Signed-off-by: Niklas Söderlund <niklas.soderlund+renesas@ragnatech.se>
Reviewed-by: Jacopo Mondi <jacopo+renesas@jmondi.org>
Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
This commit is contained in:
Niklas Söderlund 2021-07-09 16:25:58 +02:00 committed by Mauro Carvalho Chehab
parent cfef0c833a
commit c370dd7fa8
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/media/platform/rcar-vin/rcar-core.c
View File

@ -248,7 +248,8 @@ static void rvin_group_cleanup(struct rvin_group *group)
}
static int rvin_group_init(struct rvin_group *group, struct rvin_dev *vin,
int (*link_setup)(struct rvin_dev *))
int (*link_setup)(struct rvin_dev *),
const struct media_device_ops *ops)
{
struct media_device *mdev = &group->mdev;
const struct of_device_id *match;
@ -267,7 +268,7 @@ static int rvin_group_init(struct rvin_group *group, struct rvin_dev *vin,
group->link_setup = link_setup;
mdev->dev = vin->dev;
mdev->ops = &rvin_media_ops;
mdev->ops = ops;
match = of_match_node(vin->dev->driver->of_match_table,
vin->dev->of_node);
@ -299,7 +300,8 @@ static void rvin_group_release(struct kref *kref)
}
static int rvin_group_get(struct rvin_dev *vin,
int (*link_setup)(struct rvin_dev *))
int (*link_setup)(struct rvin_dev *),
const struct media_device_ops *ops)
{
struct rvin_group *group;
u32 id;
@ -331,7 +333,7 @@ static int rvin_group_get(struct rvin_dev *vin,
goto err_group;
}
ret = rvin_group_init(group, vin, link_setup);
ret = rvin_group_init(group, vin, link_setup, ops);
if (ret) {
kfree(group);
vin_err(vin, "Failed to initialize group\n");
@ -985,7 +987,7 @@ static int rvin_csi2_init(struct rvin_dev *vin)
if (ret < 0)
return ret;
ret = rvin_group_get(vin, rvin_csi2_setup_links);
ret = rvin_group_get(vin, rvin_csi2_setup_links, &rvin_media_ops);
if (ret)
goto err_controls;