aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/pci/host/pci-versatile.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/pci/host/pci-versatile.c')
-rw-r--r--drivers/pci/host/pci-versatile.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/drivers/pci/host/pci-versatile.c b/drivers/pci/host/pci-versatile.c
index f6fcec6b5578..d417acab0ecf 100644
--- a/drivers/pci/host/pci-versatile.c
+++ b/drivers/pci/host/pci-versatile.c
@@ -120,6 +120,7 @@ out_release_res:
120 120
121static int versatile_pci_probe(struct platform_device *pdev) 121static int versatile_pci_probe(struct platform_device *pdev)
122{ 122{
123 struct device *dev = &pdev->dev;
123 struct resource *res; 124 struct resource *res;
124 int ret, i, myslot = -1; 125 int ret, i, myslot = -1;
125 u32 val; 126 u32 val;
@@ -128,27 +129,26 @@ static int versatile_pci_probe(struct platform_device *pdev)
128 struct pci_host_bridge *bridge; 129 struct pci_host_bridge *bridge;
129 LIST_HEAD(pci_res); 130 LIST_HEAD(pci_res);
130 131
131 bridge = devm_pci_alloc_host_bridge(&pdev->dev, 0); 132 bridge = devm_pci_alloc_host_bridge(dev, 0);
132 if (!bridge) 133 if (!bridge)
133 return -ENOMEM; 134 return -ENOMEM;
134 135
135 res = platform_get_resource(pdev, IORESOURCE_MEM, 0); 136 res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
136 versatile_pci_base = devm_ioremap_resource(&pdev->dev, res); 137 versatile_pci_base = devm_ioremap_resource(dev, res);
137 if (IS_ERR(versatile_pci_base)) 138 if (IS_ERR(versatile_pci_base))
138 return PTR_ERR(versatile_pci_base); 139 return PTR_ERR(versatile_pci_base);
139 140
140 res = platform_get_resource(pdev, IORESOURCE_MEM, 1); 141 res = platform_get_resource(pdev, IORESOURCE_MEM, 1);
141 versatile_cfg_base[0] = devm_ioremap_resource(&pdev->dev, res); 142 versatile_cfg_base[0] = devm_ioremap_resource(dev, res);
142 if (IS_ERR(versatile_cfg_base[0])) 143 if (IS_ERR(versatile_cfg_base[0]))
143 return PTR_ERR(versatile_cfg_base[0]); 144 return PTR_ERR(versatile_cfg_base[0]);
144 145
145 res = platform_get_resource(pdev, IORESOURCE_MEM, 2); 146 res = platform_get_resource(pdev, IORESOURCE_MEM, 2);
146 versatile_cfg_base[1] = devm_pci_remap_cfg_resource(&pdev->dev, 147 versatile_cfg_base[1] = devm_pci_remap_cfg_resource(dev, res);
147 res);
148 if (IS_ERR(versatile_cfg_base[1])) 148 if (IS_ERR(versatile_cfg_base[1]))
149 return PTR_ERR(versatile_cfg_base[1]); 149 return PTR_ERR(versatile_cfg_base[1]);
150 150
151 ret = versatile_pci_parse_request_of_pci_ranges(&pdev->dev, &pci_res); 151 ret = versatile_pci_parse_request_of_pci_ranges(dev, &pci_res);
152 if (ret) 152 if (ret)
153 return ret; 153 return ret;
154 154
@@ -164,7 +164,7 @@ static int versatile_pci_probe(struct platform_device *pdev)
164 } 164 }
165 } 165 }
166 if (myslot == -1) { 166 if (myslot == -1) {
167 dev_err(&pdev->dev, "Cannot find PCI core!\n"); 167 dev_err(dev, "Cannot find PCI core!\n");
168 return -EIO; 168 return -EIO;
169 } 169 }
170 /* 170 /*
@@ -172,7 +172,7 @@ static int versatile_pci_probe(struct platform_device *pdev)
172 */ 172 */
173 pci_slot_ignore |= (1 << myslot); 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 writel(myslot, PCI_SELFID); 177 writel(myslot, PCI_SELFID);
178 local_pci_cfg_base = versatile_cfg_base[1] + (myslot << 11); 178 local_pci_cfg_base = versatile_cfg_base[1] + (myslot << 11);
@@ -205,7 +205,7 @@ static int versatile_pci_probe(struct platform_device *pdev)
205 pci_add_flags(PCI_REASSIGN_ALL_BUS | PCI_REASSIGN_ALL_RSRC); 205 pci_add_flags(PCI_REASSIGN_ALL_BUS | PCI_REASSIGN_ALL_RSRC);
206 206
207 list_splice_init(&pci_res, &bridge->windows); 207 list_splice_init(&pci_res, &bridge->windows);
208 bridge->dev.parent = &pdev->dev; 208 bridge->dev.parent = dev;
209 bridge->sysdata = NULL; 209 bridge->sysdata = NULL;
210 bridge->busnr = 0; 210 bridge->busnr = 0;
211 bridge->ops = &pci_versatile_ops; 211 bridge->ops = &pci_versatile_ops;