Commit ddfef32a authored by Ezequiel Garcia's avatar Ezequiel Garcia Committed by Mauro Carvalho Chehab

media: coda: Print a nicer device registered message

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: default avatarEzequiel Garcia <ezequiel@collabora.com>
Reviewed-by: default avatarPhilipp Zabel <p.zabel@pengutronix.de>
Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+samsung@kernel.org>
parent 1753c7c4
...@@ -2507,9 +2507,12 @@ static int coda_hw_init(struct coda_dev *dev) ...@@ -2507,9 +2507,12 @@ static int coda_hw_init(struct coda_dev *dev)
static int coda_register_device(struct coda_dev *dev, int i) static int coda_register_device(struct coda_dev *dev, int i)
{ {
struct video_device *vfd = &dev->vfd[i]; struct video_device *vfd = &dev->vfd[i];
enum coda_inst_type type;
int ret;
if (i >= dev->devtype->num_vdevs) if (i >= dev->devtype->num_vdevs)
return -EINVAL; return -EINVAL;
type = dev->devtype->vdevs[i]->type;
strscpy(vfd->name, dev->devtype->vdevs[i]->name, sizeof(vfd->name)); strscpy(vfd->name, dev->devtype->vdevs[i]->name, sizeof(vfd->name));
vfd->fops = &coda_fops; vfd->fops = &coda_fops;
...@@ -2525,7 +2528,12 @@ static int coda_register_device(struct coda_dev *dev, int i) ...@@ -2525,7 +2528,12 @@ static int coda_register_device(struct coda_dev *dev, int i)
v4l2_disable_ioctl(vfd, VIDIOC_G_CROP); v4l2_disable_ioctl(vfd, VIDIOC_G_CROP);
v4l2_disable_ioctl(vfd, VIDIOC_S_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 %s\n",
type == CODA_INST_ENCODER ? "encoder" : "decoder",
video_device_node_name(vfd));
return ret;
} }
static void coda_copy_firmware(struct coda_dev *dev, const u8 * const buf, static void coda_copy_firmware(struct coda_dev *dev, const u8 * const buf,
...@@ -2639,9 +2647,6 @@ static void coda_fw_callback(const struct firmware *fw, void *context) ...@@ -2639,9 +2647,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); pm_runtime_put_sync(&pdev->dev);
return; return;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment