]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
media: staging: atomisp: Remove redundant PCI code
authorAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Tue, 19 Dec 2017 20:59:54 +0000 (15:59 -0500)
committerMauro Carvalho Chehab <mchehab@s-opensource.com>
Fri, 29 Dec 2017 11:27:54 +0000 (06:27 -0500)
There is no need to keep a reference to PCI root bridge.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
drivers/staging/media/atomisp/pci/atomisp2/atomisp_internal.h
drivers/staging/media/atomisp/pci/atomisp2/atomisp_v4l2.c

index 52a6f8002048d2723e9eb4642139222711fc8bd1..dc476a3dd271ed9c1b5f26040323b7f1ecba3d4a 100644 (file)
@@ -227,7 +227,6 @@ struct atomisp_device {
        struct media_device media_dev;
        struct atomisp_platform_data *pdata;
        void *mmu_l1_base;
-       struct pci_dev *pci_root;
        const struct firmware *firmware;
 
        struct pm_qos_request pm_qos;
index 58f1a3597805034e1ed09899124aecf5812164df..548e00e7d67b643bc518d5a7b18332fa4bdf7ec2 100644 (file)
@@ -1210,11 +1210,6 @@ static int atomisp_pci_probe(struct pci_dev *dev,
        isp->pdev = dev;
        isp->dev = &dev->dev;
        isp->sw_contex.power_state = ATOM_ISP_POWER_UP;
-       isp->pci_root = pci_get_domain_bus_and_slot(0, 0, 0);
-       if (!isp->pci_root) {
-               dev_err(&dev->dev, "Unable to find PCI host\n");
-               return -ENODEV;
-       }
        isp->saved_regs.ispmmadr = start;
 
        rt_mutex_init(&isp->mutex);
@@ -1494,7 +1489,6 @@ load_fw_fail:
        /* Address later when we worry about the ...field chips */
        if (IS_ENABLED(CONFIG_PM) && atomisp_mrfld_power_down(isp))
                dev_err(&dev->dev, "Failed to switch off ISP\n");
-       pci_dev_put(isp->pci_root);
        return err;
 }
 
@@ -1515,8 +1509,6 @@ static void atomisp_pci_remove(struct pci_dev *dev)
        pm_qos_remove_request(&isp->pm_qos);
 
        atomisp_msi_irq_uninit(isp, dev);
-       pci_dev_put(isp->pci_root);
-
        atomisp_unregister_entities(isp);
 
        destroy_workqueue(isp->wdt_work_queue);