- Remove obsolete path from comment (Flavio Suligoi) - Simplify cdns_pcie_host_init_address_translation() (Qinglang Miao) * remotes/lorenzo/pci/cadence: PCI: cadence: Simplify cdns_pcie_host_init_address_translation() return expression PCI: cadence-ep: Remove obsolete path from comment
Unified · Split
| @@ -328,7 +328,6 @@ static int cdns_pcie_ep_send_legacy_irq(struct cdns_pcie_ep *ep, u8 fn, u8 intx) · 327 unmodified lines | ||
| 328 | 328 | cdns_pcie_ep_assert_intx(ep, fn, intx, true); |
| 329 | 329 | /* |
| 330 | 330 | * The mdelay() value was taken from dra7xx_pcie_raise_legacy_irq() |
| 331 | − * from drivers/pci/dwc/pci-dra7xx.c | |
| 332 | 331 | */ |
| 333 | 332 | mdelay(1); |
| 334 | 333 | cdns_pcie_ep_assert_intx(ep, fn, intx, false); |
| @@ -337,7 +337,7 @@ static int cdns_pcie_host_init_address_translation(struct cdns_pcie_rc *rc) · 336 unmodified lines | ||
| 337 | 337 | struct resource_entry *entry; |
| 338 | 338 | u64 cpu_addr = cfg_res->start; |
| 339 | 339 | u32 addr0, addr1, desc1; |
| 340 | − int r, err, busnr = 0; | |
| 340 | + int r, busnr = 0; | |
| 341 | 341 | |
| 342 | 342 | entry = resource_list_first_type(&bridge->windows, IORESOURCE_BUS); |
| 343 | 343 | if (entry) |
| @@ -383,11 +383,7 @@ static int cdns_pcie_host_init_address_translation(struct cdns_pcie_rc *rc) · 39 unmodified lines | ||
| 383 | 383 | r++; |
| 384 | 384 | } |
| 385 | 385 | |
| 386 | − err = cdns_pcie_host_map_dma_ranges(rc); | |
| 387 | − if (err) | |
| 388 | − return err; | |
| 389 | − | |
| 390 | − return 0; | |
| 386 | + return cdns_pcie_host_map_dma_ranges(rc); | |
| 391 | 387 | } |
| 392 | 388 | |
| 393 | 389 | static int cdns_pcie_host_init(struct device *dev, |