Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

PCI: iproc: Rename iproc_pcie_bcma_ to iproc_bcma_pcie_

Rename iproc_pcie_bcma_* to iproc_bcma_pcie_* for consistency with other
drivers. No functional change intended.

Link: https://lore.kernel.org/r/20211223011054.1227810-12-helgaas@kernel.org
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Cc: Ray Jui <rjui@broadcom.com>
Cc: Scott Branden <sbranden@broadcom.com>

+11 -11
+11 -11
drivers/pci/controller/pcie-iproc-bcma.c
··· 23 23 DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_BROADCOM, 0x8011, bcma_pcie2_fixup_class); 24 24 DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_BROADCOM, 0x8012, bcma_pcie2_fixup_class); 25 25 26 - static int iproc_pcie_bcma_map_irq(const struct pci_dev *dev, u8 slot, u8 pin) 26 + static int iproc_bcma_pcie_map_irq(const struct pci_dev *dev, u8 slot, u8 pin) 27 27 { 28 28 struct iproc_pcie *pcie = dev->sysdata; 29 29 struct bcma_device *bdev = container_of(pcie->dev, struct bcma_device, dev); ··· 31 31 return bcma_core_irq(bdev, 5); 32 32 } 33 33 34 - static int iproc_pcie_bcma_probe(struct bcma_device *bdev) 34 + static int iproc_bcma_pcie_probe(struct bcma_device *bdev) 35 35 { 36 36 struct device *dev = &bdev->dev; 37 37 struct iproc_pcie *pcie; ··· 64 64 if (ret) 65 65 return ret; 66 66 67 - pcie->map_irq = iproc_pcie_bcma_map_irq; 67 + pcie->map_irq = iproc_bcma_pcie_map_irq; 68 68 69 69 bcma_set_drvdata(bdev, pcie); 70 70 71 71 return iproc_pcie_setup(pcie, &bridge->windows); 72 72 } 73 73 74 - static void iproc_pcie_bcma_remove(struct bcma_device *bdev) 74 + static void iproc_bcma_pcie_remove(struct bcma_device *bdev) 75 75 { 76 76 struct iproc_pcie *pcie = bcma_get_drvdata(bdev); 77 77 78 78 iproc_pcie_remove(pcie); 79 79 } 80 80 81 - static const struct bcma_device_id iproc_pcie_bcma_table[] = { 81 + static const struct bcma_device_id iproc_bcma_pcie_table[] = { 82 82 BCMA_CORE(BCMA_MANUF_BCM, BCMA_CORE_NS_PCIEG2, BCMA_ANY_REV, BCMA_ANY_CLASS), 83 83 {}, 84 84 }; 85 - MODULE_DEVICE_TABLE(bcma, iproc_pcie_bcma_table); 85 + MODULE_DEVICE_TABLE(bcma, iproc_bcma_pcie_table); 86 86 87 - static struct bcma_driver iproc_pcie_bcma_driver = { 87 + static struct bcma_driver iproc_bcma_pcie_driver = { 88 88 .name = KBUILD_MODNAME, 89 - .id_table = iproc_pcie_bcma_table, 90 - .probe = iproc_pcie_bcma_probe, 91 - .remove = iproc_pcie_bcma_remove, 89 + .id_table = iproc_bcma_pcie_table, 90 + .probe = iproc_bcma_pcie_probe, 91 + .remove = iproc_bcma_pcie_remove, 92 92 }; 93 - module_bcma_driver(iproc_pcie_bcma_driver); 93 + module_bcma_driver(iproc_bcma_pcie_driver); 94 94 95 95 MODULE_AUTHOR("Hauke Mehrtens"); 96 96 MODULE_DESCRIPTION("Broadcom iProc PCIe BCMA driver");