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

PCI: versatile: Add local struct device pointers

Use a local "struct device *dev" for brevity and consistency with other
drivers. No functional change intended.

Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>

Bjorn Helgaas 7d630aaa 769b461f

+9 -9
+9 -9
drivers/pci/host/pci-versatile.c
··· 120 120 121 121 static int versatile_pci_probe(struct platform_device *pdev) 122 122 { 123 + struct device *dev = &pdev->dev; 123 124 struct resource *res; 124 125 int ret, i, myslot = -1; 125 126 u32 val; ··· 129 128 struct pci_host_bridge *bridge; 130 129 LIST_HEAD(pci_res); 131 130 132 - bridge = devm_pci_alloc_host_bridge(&pdev->dev, 0); 131 + bridge = devm_pci_alloc_host_bridge(dev, 0); 133 132 if (!bridge) 134 133 return -ENOMEM; 135 134 136 135 res = platform_get_resource(pdev, IORESOURCE_MEM, 0); 137 - versatile_pci_base = devm_ioremap_resource(&pdev->dev, res); 136 + versatile_pci_base = devm_ioremap_resource(dev, res); 138 137 if (IS_ERR(versatile_pci_base)) 139 138 return PTR_ERR(versatile_pci_base); 140 139 141 140 res = platform_get_resource(pdev, IORESOURCE_MEM, 1); 142 - versatile_cfg_base[0] = devm_ioremap_resource(&pdev->dev, res); 141 + versatile_cfg_base[0] = devm_ioremap_resource(dev, res); 143 142 if (IS_ERR(versatile_cfg_base[0])) 144 143 return PTR_ERR(versatile_cfg_base[0]); 145 144 146 145 res = platform_get_resource(pdev, IORESOURCE_MEM, 2); 147 - versatile_cfg_base[1] = devm_pci_remap_cfg_resource(&pdev->dev, 148 - res); 146 + versatile_cfg_base[1] = devm_pci_remap_cfg_resource(dev, res); 149 147 if (IS_ERR(versatile_cfg_base[1])) 150 148 return PTR_ERR(versatile_cfg_base[1]); 151 149 152 - ret = versatile_pci_parse_request_of_pci_ranges(&pdev->dev, &pci_res); 150 + ret = versatile_pci_parse_request_of_pci_ranges(dev, &pci_res); 153 151 if (ret) 154 152 return ret; 155 153 ··· 164 164 } 165 165 } 166 166 if (myslot == -1) { 167 - dev_err(&pdev->dev, "Cannot find PCI core!\n"); 167 + dev_err(dev, "Cannot find PCI core!\n"); 168 168 return -EIO; 169 169 } 170 170 /* ··· 172 172 */ 173 173 pci_slot_ignore |= (1 << myslot); 174 174 175 - dev_info(&pdev->dev, "PCI core found (slot %d)\n", myslot); 175 + dev_info(dev, "PCI core found (slot %d)\n", myslot); 176 176 177 177 writel(myslot, PCI_SELFID); 178 178 local_pci_cfg_base = versatile_cfg_base[1] + (myslot << 11); ··· 205 205 pci_add_flags(PCI_REASSIGN_ALL_BUS | PCI_REASSIGN_ALL_RSRC); 206 206 207 207 list_splice_init(&pci_res, &bridge->windows); 208 - bridge->dev.parent = &pdev->dev; 208 + bridge->dev.parent = dev; 209 209 bridge->sysdata = NULL; 210 210 bridge->busnr = 0; 211 211 bridge->ops = &pci_versatile_ops;