microsoft
/
WSL2-Linux-Kernel
зеркало из https://github.com/microsoft/WSL2-Linux-Kernel.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

media: cafe-driver: use drvdata instead of back-casting from v4l2_device 

Since commit 95db3a60e0 ("[media] v4l: Add a media_device pointer
to the v4l2_device structure") the v4l core doesn't insist on using drvdata
itself.  Therefore we can use it ourselves, making things somewhat simpler.

Signed-off-by: Lubomir Rintel <lkundrak@v3.sk>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
This commit is contained in:
Lubomir Rintel 2020-08-18 00:08:47 +02:00 коммит произвёл Mauro Carvalho Chehab
Родитель 17621758e5
Коммит 953e41153a
1 изменённых файлов: 4 добавлений и 6 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

10
drivers/media/platform/marvell-ccic/cafe-driver.c
Просмотреть файл

@ -497,6 +497,7 @@ static int cafe_pci_probe(struct pci_dev *pdev,
cam = kzalloc(sizeof(struct cafe_camera), GFP_KERNEL); cam = kzalloc(sizeof(struct cafe_camera), GFP_KERNEL);
if (cam == NULL) if (cam == NULL)
goto out; goto out;
pci_set_drvdata(pdev, cam);
cam->pdev = pdev; cam->pdev = pdev;
mcam = &cam->mcam; mcam = &cam->mcam;
mcam->chip_id = MCAM_CAFE; mcam->chip_id = MCAM_CAFE;
@ -592,8 +593,7 @@ static void cafe_shutdown(struct cafe_camera *cam)
static void cafe_pci_remove(struct pci_dev *pdev) static void cafe_pci_remove(struct pci_dev *pdev)
{ {
struct v4l2_device *v4l2_dev = dev_get_drvdata(&pdev->dev); struct cafe_camera *cam = pci_get_drvdata(pdev);
struct cafe_camera *cam = to_cam(v4l2_dev);
if (cam == NULL) { if (cam == NULL) {
printk(KERN_WARNING "pci_remove on unknown pdev %p\n", pdev); printk(KERN_WARNING "pci_remove on unknown pdev %p\n", pdev);
@ -609,8 +609,7 @@ static void cafe_pci_remove(struct pci_dev *pdev)
*/ */
static int __maybe_unused cafe_pci_suspend(struct device *dev) static int __maybe_unused cafe_pci_suspend(struct device *dev)
{ {
struct v4l2_device *v4l2_dev = dev_get_drvdata(dev); struct cafe_camera *cam = dev_get_drvdata(dev);
struct cafe_camera *cam = to_cam(v4l2_dev);
mccic_suspend(&cam->mcam); mccic_suspend(&cam->mcam);
return 0; return 0;
@ -619,8 +618,7 @@ static int __maybe_unused cafe_pci_suspend(struct device *dev)
static int __maybe_unused cafe_pci_resume(struct device *dev) static int __maybe_unused cafe_pci_resume(struct device *dev)
{ {
struct v4l2_device *v4l2_dev = dev_get_drvdata(dev); struct cafe_camera *cam = dev_get_drvdata(dev);
struct cafe_camera *cam = to_cam(v4l2_dev);
cafe_ctlr_init(&cam->mcam); cafe_ctlr_init(&cam->mcam);
return mccic_resume(&cam->mcam); return mccic_resume(&cam->mcam);