Commit 6ae0455a authored by Ricardo Ribalda's avatar Ricardo Ribalda Committed by Hans Verkuil
Browse files

media: solo6x10: Use pcim functions 



Instead of handling manually the release of the memory regions let devm
do that for us.

Makes smatch happy:
drivers/media/pci/solo6x10/solo6x10-core.c:631 solo_pci_probe() warn: 'pdev' from pci_request_regions() not released on lines: 631.

Signed-off-by: default avatarRicardo Ribalda <ribalda@chromium.org>
Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
parent 81741e80

drivers/media/pci/solo6x10/solo6x10-core.c

+2 −9
Original line number Diff line number Diff line
@@ -145,10 +145,8 @@ static void free_solo_dev(struct solo_dev *solo_dev) 
		/* Now cleanup the PCI device */

		solo_irq_off(solo_dev, ~0);

		free_irq(pdev->irq, solo_dev);

		pci_iounmap(pdev, solo_dev->reg_base);

	}



	pci_release_regions(pdev);

	pci_disable_device(pdev);

	v4l2_device_unregister(&solo_dev->v4l2_dev);

	pci_set_drvdata(pdev, NULL);
@@ -480,15 +478,10 @@ static int solo_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id) 
	pci_write_config_byte(pdev, 0x40, 0x00);

	pci_write_config_byte(pdev, 0x41, 0x00);



	ret = pci_request_regions(pdev, SOLO6X10_NAME);

	ret = pcim_iomap_regions(pdev, BIT(0), SOLO6X10_NAME);

	if (ret)

		goto fail_probe;



	solo_dev->reg_base = pci_ioremap_bar(pdev, 0);

	if (solo_dev->reg_base == NULL) {

		ret = -ENOMEM;

		goto fail_probe;

	}

	solo_dev->reg_base = pcim_iomap_table(pdev)[0];



	chip_id = solo_reg_read(solo_dev, SOLO_CHIP_OPTION) &

				SOLO_CHIP_ID_MASK;