Commit ce72671d authored by Corentin Labbe's avatar Corentin Labbe Committed by Mauro Carvalho Chehab

media: zoran: convert irq to pci irq

This patch convert zoran to pci_irq functions.
Signed-off-by: default avatarCorentin Labbe <clabbe@baylibre.com>
Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+huawei@kernel.org>
parent 799cb9e3
...@@ -1015,7 +1015,7 @@ static void zoran_remove(struct pci_dev *pdev) ...@@ -1015,7 +1015,7 @@ static void zoran_remove(struct pci_dev *pdev)
zoran_set_pci_master(zr, 0); zoran_set_pci_master(zr, 0);
/* put chip into reset */ /* put chip into reset */
btwrite(0, ZR36057_SPGPPCR); btwrite(0, ZR36057_SPGPPCR);
free_irq(zr->pci_dev->irq, zr); pci_free_irq(zr->pci_dev, 0, zr);
/* unmap and free memory */ /* unmap and free memory */
dma_free_coherent(&zr->pci_dev->dev, BUZ_NUM_STAT_COM * sizeof(u32), zr->stat_com, zr->p_sc); dma_free_coherent(&zr->pci_dev->dev, BUZ_NUM_STAT_COM * sizeof(u32), zr->stat_com, zr->p_sc);
iounmap(zr->zr36057_mem); iounmap(zr->zr36057_mem);
...@@ -1175,8 +1175,7 @@ static int zoran_probe(struct pci_dev *pdev, const struct pci_device_id *ent) ...@@ -1175,8 +1175,7 @@ static int zoran_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
goto zr_unreg; goto zr_unreg;
} }
result = request_irq(zr->pci_dev->irq, zoran_irq, result = pci_request_irq(pdev, 0, zoran_irq, NULL, zr, ZR_DEVNAME(zr));
IRQF_SHARED, ZR_DEVNAME(zr), zr);
if (result < 0) { if (result < 0) {
if (result == -EINVAL) { if (result == -EINVAL) {
pci_err(pdev, "%s - bad IRQ number or handler\n", __func__); pci_err(pdev, "%s - bad IRQ number or handler\n", __func__);
...@@ -1292,7 +1291,7 @@ static int zoran_probe(struct pci_dev *pdev, const struct pci_device_id *ent) ...@@ -1292,7 +1291,7 @@ static int zoran_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
zoran_unregister_i2c(zr); zoran_unregister_i2c(zr);
zr_free_irq: zr_free_irq:
btwrite(0, ZR36057_SPGPPCR); btwrite(0, ZR36057_SPGPPCR);
free_irq(zr->pci_dev->irq, zr); pci_free_irq(zr->pci_dev, 0, zr);
zr_unmap: zr_unmap:
iounmap(zr->zr36057_mem); iounmap(zr->zr36057_mem);
zr_unreg: zr_unreg:
......
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