Commit 7c3b2c93 authored by Uwe Kleine-König's avatar Uwe Kleine-König Committed by Bjorn Helgaas

ssb: Use dev_driver_string() instead of pci_dev->driver->name

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.deSigned-off-by: default avatarUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
Acked-by: default avatarMichael Büsch <m@bues.ch>
parent 823c523e
...@@ -69,7 +69,6 @@ static int ssb_pcihost_probe(struct pci_dev *dev, ...@@ -69,7 +69,6 @@ static int ssb_pcihost_probe(struct pci_dev *dev,
{ {
struct ssb_bus *ssb; struct ssb_bus *ssb;
int err = -ENOMEM; int err = -ENOMEM;
const char *name;
u32 val; u32 val;
ssb = kzalloc(sizeof(*ssb), GFP_KERNEL); ssb = kzalloc(sizeof(*ssb), GFP_KERNEL);
...@@ -78,10 +77,7 @@ static int ssb_pcihost_probe(struct pci_dev *dev, ...@@ -78,10 +77,7 @@ static int ssb_pcihost_probe(struct pci_dev *dev,
err = pci_enable_device(dev); err = pci_enable_device(dev);
if (err) if (err)
goto err_kfree_ssb; goto err_kfree_ssb;
name = dev_name(&dev->dev); err = pci_request_regions(dev, dev_driver_string(&dev->dev));
if (dev->driver && dev->driver->name)
name = dev->driver->name;
err = pci_request_regions(dev, name);
if (err) if (err)
goto err_pci_disable; goto err_pci_disable;
pci_set_master(dev); pci_set_master(dev);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment