On 4/25/19 8:35 PM, Ezequiel Garcia wrote:
> This is just a cosmetic change to print a more descriptive
> message, to distinguish decoder from encoder:
>
> So, instead of printing
>
> coda 2040000.vpu: codec registered as /dev/video[4-5]
>
> With this change, the driver now prints
>
> coda 2040000.vpu: encoder registered as /dev/video4
> coda 2040000.vpu: decoder registered as /dev/video5
>
> Signed-off-by: Ezequiel Garcia <[email protected]>
> ---
> drivers/media/platform/coda/coda-common.c | 13 +++++++++----
> 1 file changed, 9 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/media/platform/coda/coda-common.c
> b/drivers/media/platform/coda/coda-common.c
> index 3ce58dee4422..1f53ca4effd2 100644
> --- a/drivers/media/platform/coda/coda-common.c
> +++ b/drivers/media/platform/coda/coda-common.c
> @@ -2480,9 +2480,12 @@ static int coda_hw_init(struct coda_dev *dev)
> static int coda_register_device(struct coda_dev *dev, int i)
> {
> struct video_device *vfd = &dev->vfd[i];
> + enum coda_inst_type type;
> + int ret;
>
> if (i >= dev->devtype->num_vdevs)
> return -EINVAL;
> + type = dev->devtype->vdevs[i]->type;
>
> strscpy(vfd->name, dev->devtype->vdevs[i]->name, sizeof(vfd->name));
> vfd->fops = &coda_fops;
> @@ -2498,7 +2501,12 @@ static int coda_register_device(struct coda_dev *dev,
> int i)
> v4l2_disable_ioctl(vfd, VIDIOC_G_CROP);
> v4l2_disable_ioctl(vfd, VIDIOC_S_CROP);
>
> - return video_register_device(vfd, VFL_TYPE_GRABBER, 0);
> + ret = video_register_device(vfd, VFL_TYPE_GRABBER, 0);
> + if (!ret)
> + v4l2_info(&dev->v4l2_dev, "%s registered as /dev/video%d\n",
> + type == CODA_INST_ENCODER ? "encoder" : "decoder",
> + vfd->num);
You can use video_device_node_name() to print the video node name.
Regards,
Hans
> + return ret;
> }
>
> static void coda_copy_firmware(struct coda_dev *dev, const u8 * const buf,
> @@ -2612,9 +2620,6 @@ static void coda_fw_callback(const struct firmware *fw,
> void *context)
> }
> }
>
> - v4l2_info(&dev->v4l2_dev, "codec registered as /dev/video[%d-%d]\n",
> - dev->vfd[0].num, dev->vfd[i - 1].num);
> -
> pm_runtime_put_sync(&pdev->dev);
> return;
>
>
