]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
bcma: simplify reference to driver name
authorUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Mon, 4 Oct 2021 12:59:28 +0000 (14:59 +0200)
committerBjorn Helgaas <bhelgaas@google.com>
Tue, 12 Oct 2021 22:50:12 +0000 (17:50 -0500)
When bcma_host_pci_probe() is called, the PCI driver core has already
assigned the device's driver in local_pci_probe(). So dev->driver is always
true, and here it points to bcma_pci_bridge_driver, which has .name set to
"bcma-pci-bridge". Simplify accordingly.

Link: https://lore.kernel.org/r/20211004125935.2300113-5-u.kleine-koenig@pengutronix.de
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
drivers/bcma/host_pci.c

index 69c10a7b7c617b0155637c42e53821693445b826..960632197b054c9bb6a16e3ef9ce779b2388ee1f 100644 (file)
@@ -162,7 +162,6 @@ static int bcma_host_pci_probe(struct pci_dev *dev,
 {
        struct bcma_bus *bus;
        int err = -ENOMEM;
-       const char *name;
        u32 val;
 
        /* Alloc */
@@ -175,10 +174,7 @@ static int bcma_host_pci_probe(struct pci_dev *dev,
        if (err)
                goto err_kfree_bus;
 
-       name = dev_name(&dev->dev);
-       if (dev->driver && dev->driver->name)
-               name = dev->driver->name;
-       err = pci_request_regions(dev, name);
+       err = pci_request_regions(dev, "bcma-pci-bridge");
        if (err)
                goto err_pci_disable;
        pci_set_master(dev);