Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

media: use getter/setter functions

Use getter and setter functions, for a variety of data types.

Signed-off-by: Julia Lawall <Julia.Lawall@inria.fr>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>

authored by

Julia Lawall and committed by
Mauro Carvalho Chehab
18490a1a 21ea3def

+9 -9
+1 -1
drivers/media/pci/ivtv/ivtv-driver.c
··· 1393 1393 1394 1394 static void ivtv_remove(struct pci_dev *pdev) 1395 1395 { 1396 - struct v4l2_device *v4l2_dev = dev_get_drvdata(&pdev->dev); 1396 + struct v4l2_device *v4l2_dev = pci_get_drvdata(pdev); 1397 1397 struct ivtv *itv = to_ivtv(v4l2_dev); 1398 1398 int i; 1399 1399
+3 -3
drivers/media/platform/fsl-viu.c
··· 1529 1529 1530 1530 static int viu_of_remove(struct platform_device *op) 1531 1531 { 1532 - struct v4l2_device *v4l2_dev = dev_get_drvdata(&op->dev); 1532 + struct v4l2_device *v4l2_dev = platform_get_drvdata(op); 1533 1533 struct viu_dev *dev = container_of(v4l2_dev, struct viu_dev, v4l2_dev); 1534 1534 struct v4l2_subdev *sdev = list_entry(v4l2_dev->subdevs.next, 1535 1535 struct v4l2_subdev, list); ··· 1550 1550 #ifdef CONFIG_PM 1551 1551 static int viu_suspend(struct platform_device *op, pm_message_t state) 1552 1552 { 1553 - struct v4l2_device *v4l2_dev = dev_get_drvdata(&op->dev); 1553 + struct v4l2_device *v4l2_dev = platform_get_drvdata(op); 1554 1554 struct viu_dev *dev = container_of(v4l2_dev, struct viu_dev, v4l2_dev); 1555 1555 1556 1556 clk_disable(dev->clk); ··· 1559 1559 1560 1560 static int viu_resume(struct platform_device *op) 1561 1561 { 1562 - struct v4l2_device *v4l2_dev = dev_get_drvdata(&op->dev); 1562 + struct v4l2_device *v4l2_dev = platform_get_drvdata(op); 1563 1563 struct viu_dev *dev = container_of(v4l2_dev, struct viu_dev, v4l2_dev); 1564 1564 1565 1565 clk_enable(dev->clk);
+2 -2
drivers/media/platform/pxa_camera.c
··· 2389 2389 2390 2390 pxa_camera_activate(pcdev); 2391 2391 2392 - dev_set_drvdata(&pdev->dev, pcdev); 2392 + platform_set_drvdata(pdev, pcdev); 2393 2393 err = v4l2_device_register(&pdev->dev, &pcdev->v4l2_dev); 2394 2394 if (err) 2395 2395 goto exit_deactivate; ··· 2421 2421 2422 2422 static int pxa_camera_remove(struct platform_device *pdev) 2423 2423 { 2424 - struct pxa_camera_dev *pcdev = dev_get_drvdata(&pdev->dev); 2424 + struct pxa_camera_dev *pcdev = platform_get_drvdata(pdev); 2425 2425 2426 2426 pxa_camera_deactivate(pcdev); 2427 2427 tasklet_kill(&pcdev->task_eof);
+1 -1
drivers/media/radio/radio-maxiradio.c
··· 176 176 177 177 static void maxiradio_remove(struct pci_dev *pdev) 178 178 { 179 - struct v4l2_device *v4l2_dev = dev_get_drvdata(&pdev->dev); 179 + struct v4l2_device *v4l2_dev = pci_get_drvdata(pdev); 180 180 struct maxiradio *dev = to_maxiradio(v4l2_dev); 181 181 182 182 snd_tea575x_exit(&dev->tea);
+2 -2
drivers/media/spi/cxd2880-spi.c
··· 535 535 536 536 dvb_spi->spi = spi; 537 537 mutex_init(&dvb_spi->spi_mutex); 538 - dev_set_drvdata(&spi->dev, dvb_spi); 538 + spi_set_drvdata(spi, dvb_spi); 539 539 config.spi = spi; 540 540 config.spi_mutex = &dvb_spi->spi_mutex; 541 541 ··· 632 632 return -EINVAL; 633 633 } 634 634 635 - dvb_spi = dev_get_drvdata(&spi->dev); 635 + dvb_spi = spi_get_drvdata(spi); 636 636 637 637 if (!dvb_spi) { 638 638 pr_err("failed\n");