Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d9ebd623 authored by Hans Verkuil's avatar Hans Verkuil Committed by Mauro Carvalho Chehab
Browse files

[media] solo6x10: add v4l2_device 



Add support for struct v4l2_device.

Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 20c5f492

drivers/staging/media/solo6x10/core.c

+6 −2
Original line number Diff line number Diff line
@@ -181,6 +181,7 @@ static void free_solo_dev(struct solo_dev *solo_dev) 


	pci_release_regions(pdev);

	pci_disable_device(pdev);

	v4l2_device_unregister(&solo_dev->v4l2_dev);

	pci_set_drvdata(pdev, NULL);



	kfree(solo_dev);
@@ -511,7 +512,9 @@ static int solo_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id) 
	solo_dev->type = id->driver_data;

	solo_dev->pdev = pdev;

	spin_lock_init(&solo_dev->reg_io_lock);

	pci_set_drvdata(pdev, solo_dev);

	ret = v4l2_device_register(&pdev->dev, &solo_dev->v4l2_dev);

	if (ret)

		goto fail_probe;



	/* Only for during init */

	solo_dev->p2m_jiffies = msecs_to_jiffies(100);
@@ -678,7 +681,8 @@ static int solo_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id) 


static void solo_pci_remove(struct pci_dev *pdev)

{

	struct solo_dev *solo_dev = pci_get_drvdata(pdev);

	struct v4l2_device *v4l2_dev = pci_get_drvdata(pdev);

	struct solo_dev *solo_dev = container_of(v4l2_dev, struct solo_dev, v4l2_dev);



	free_solo_dev(solo_dev);

}

drivers/staging/media/solo6x10/solo6x10.h

+2 −0
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ 
#include <linux/videodev2.h>



#include <media/v4l2-dev.h>

#include <media/v4l2-device.h>

#include <media/videobuf-core.h>



#include "registers.h"
@@ -178,6 +179,7 @@ struct solo_dev { 
	u32			irq_mask;

	u32			motion_mask;

	spinlock_t		reg_io_lock;

	struct v4l2_device	v4l2_dev;



	/* tw28xx accounting */

	u8			tw2865, tw2864, tw2815;

drivers/staging/media/solo6x10/v4l2-enc.c

+1 −1
Original line number Diff line number Diff line
@@ -1670,7 +1670,7 @@ static struct solo_enc_dev *solo_enc_alloc(struct solo_dev *solo_dev, 
	solo_enc->ch = ch;



	*solo_enc->vfd = solo_enc_template;

	solo_enc->vfd->parent = &solo_dev->pdev->dev;

	solo_enc->vfd->v4l2_dev = &solo_dev->v4l2_dev;

	ret = video_register_device(solo_enc->vfd, VFL_TYPE_GRABBER, nr);

	if (ret < 0) {

		video_device_release(solo_enc->vfd);

drivers/staging/media/solo6x10/v4l2.c

+1 −1
Original line number Diff line number Diff line
@@ -823,7 +823,7 @@ int solo_v4l2_init(struct solo_dev *solo_dev, unsigned nr) 
		return -ENOMEM;



	*solo_dev->vfd = solo_v4l2_template;

	solo_dev->vfd->parent = &solo_dev->pdev->dev;

	solo_dev->vfd->v4l2_dev = &solo_dev->v4l2_dev;



	ret = video_register_device(solo_dev->vfd, VFL_TYPE_GRABBER, nr);

	if (ret < 0) {