]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
ssb: Use dev_driver_string() instead of pci_dev->driver->name
authorUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Mon, 4 Oct 2021 12:59:30 +0000 (14:59 +0200)
committerBjorn Helgaas <bhelgaas@google.com>
Tue, 12 Oct 2021 22:50:12 +0000 (17:50 -0500)
All drivers that use ssb_pcihost_probe(), i.e., b43_pci_bridge_driver and
b44_pci_driver, set the pci_driver.name, and __pci_register_driver() sets
the struct driver.name member to the same value.

Replace dev->driver_name() by dev_driver_string() for the corresponding
struct device.  This is a step toward removing pci_dev->driver.

Link: https://lore.kernel.org/r/20211004125935.2300113-7-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>
Acked-by: Michael Büsch <m@bues.ch>
drivers/ssb/pcihost_wrapper.c

index 410215c169208f1735ed3df0e76189bab8c980c8..dd70fd41c77d06957513eda59b41e9f671f02ca4 100644 (file)
@@ -69,7 +69,6 @@ static int ssb_pcihost_probe(struct pci_dev *dev,
 {
        struct ssb_bus *ssb;
        int err = -ENOMEM;
-       const char *name;
        u32 val;
 
        ssb = kzalloc(sizeof(*ssb), GFP_KERNEL);
@@ -78,10 +77,7 @@ static int ssb_pcihost_probe(struct pci_dev *dev,
        err = pci_enable_device(dev);
        if (err)
                goto err_kfree_ssb;
-       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, dev_driver_string(&dev->dev));
        if (err)
                goto err_pci_disable;
        pci_set_master(dev);