media: tw5864: Replace deprecated PCI functions

pcim_iomap_table() and pcim_iomap_regions() have been deprecated.
pcim_iomap_regions(), furthermore, has so far wrongly been passed the
device's name instead of the driver's name, which makes that function's
debug prints useless.

Replace the deprecated function with pcim_iomap_region().

Define the driver name globally and use it where appropriate.

Signed-off-by: Philipp Stanner <phasta@kernel.org>
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>

diff --git a/drivers/media/pci/tw5864/tw5864-core.c b/drivers/media/pci/tw5864/tw5864-core.c
index 4d33caf833072acc080f38d4f962ee7428a3c7f9..832788603f88527a49479b2c101d22bdeee608f1 100644 (file)
--- a/drivers/media/pci/tw5864/tw5864-core.c
+++ b/drivers/media/pci/tw5864/tw5864-core.c
@@ -24,6 +24,8 @@
 #include "tw5864.h"
 #include "tw5864-reg.h"
 
+#define DRIVER_NAME "tw5864"
+
 MODULE_DESCRIPTION("V4L2 driver module for tw5864-based multimedia capture & encoding devices");
 MODULE_AUTHOR("Bluecherry Maintainers <maintainers@bluecherrydvr.com>");
 MODULE_AUTHOR("Andrey Utkin <andrey.utkin@corp.bluecherry.net>");
@@ -246,7 +248,8 @@ static int tw5864_initdev(struct pci_dev *pci_dev,
        if (!dev)
                return -ENOMEM;
 
-       snprintf(dev->name, sizeof(dev->name), "tw5864:%s", pci_name(pci_dev));
+       snprintf(dev->name, sizeof(dev->name), "%s:%s", DRIVER_NAME,
+                pci_name(pci_dev));
 
        err = v4l2_device_register(&pci_dev->dev, &dev->v4l2_dev);
        if (err)
@@ -269,12 +272,12 @@ static int tw5864_initdev(struct pci_dev *pci_dev,
        }
 
        /* get mmio */
-       err = pcim_iomap_regions(pci_dev, BIT(0), dev->name);
+       dev->mmio = pcim_iomap_region(pci_dev, 0, DRIVER_NAME);
+       err = PTR_ERR_OR_ZERO(dev->mmio);
        if (err) {
                dev_err(&dev->pci->dev, "Cannot request regions for MMIO\n");
                goto unreg_v4l2;
        }
-       dev->mmio = pcim_iomap_table(pci_dev)[0];
 
        spin_lock_init(&dev->slock);
 
@@ -290,7 +293,7 @@ static int tw5864_initdev(struct pci_dev *pci_dev,
 
        /* get irq */
        err = devm_request_irq(&pci_dev->dev, pci_dev->irq, tw5864_isr,
-                              IRQF_SHARED, "tw5864", dev);
+                              IRQF_SHARED, DRIVER_NAME, dev);
        if (err < 0) {
                dev_err(&dev->pci->dev, "can't get IRQ %d\n", pci_dev->irq);
                goto fini_video;
@@ -324,7 +327,7 @@ static void tw5864_finidev(struct pci_dev *pci_dev)
 }
 
 static struct pci_driver tw5864_pci_driver = {
-       .name = "tw5864",
+       .name = DRIVER_NAME,
        .id_table = tw5864_pci_tbl,
        .probe = tw5864_initdev,
        .remove = tw5864_finidev,