[media] cobalt: allow fewer than 8 PCIe lanes

Currently the cobalt driver refuses to load if fewer than 8 PCIe lanes
are assigned. This patch changes this and just issues a warning. The
only time it will refuse to load is if the number of assigned lanes is less
than what the PCIe host is capable of since this suggests that the card
isn't seated correctly in the slot.

Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>

diff --git a/drivers/media/pci/cobalt/cobalt-driver.c b/drivers/media/pci/cobalt/cobalt-driver.c
index b994b8efdc99a63dc61e5321557a667e07a90fa4..8fed61ec712ef01440461eafb6ecd07b3aafa486 100644 (file)
--- a/drivers/media/pci/cobalt/cobalt-driver.c
+++ b/drivers/media/pci/cobalt/cobalt-driver.c
@@ -339,15 +339,16 @@ static int cobalt_setup_pci(struct cobalt *cobalt, struct pci_dev *pci_dev,
        }
 
        if (pcie_link_get_lanes(cobalt) != 8) {
-               cobalt_err("PCI Express link width is not 8 lanes (%d)\n",
+               cobalt_warn("PCI Express link width is %d lanes.\n",
                                pcie_link_get_lanes(cobalt));
                if (pcie_bus_link_get_lanes(cobalt) < 8)
-                       cobalt_err("The current slot only supports %d lanes, at least 8 are needed\n",
+                       cobalt_warn("The current slot only supports %d lanes, for best performance 8 are needed\n",
                                        pcie_bus_link_get_lanes(cobalt));
-               else
+               if (pcie_link_get_lanes(cobalt) != pcie_bus_link_get_lanes(cobalt)) {
                        cobalt_err("The card is most likely not seated correctly in the PCIe slot\n");
-               ret = -EIO;
-               goto err_disable;
+                       ret = -EIO;
+                       goto err_disable;
+               }
        }
 
        if (pci_set_dma_mask(pci_dev, DMA_BIT_MASK(64))) {