On Thu, Aug 02, 2007 at 03:45:52PM -0700, Brandon Philips wrote: > if ((err = pci_request_regions(pdev, e1000_driver_name))) > - goto err_pci_reg; > + goto err_dma;
Why not just return? Ditto for all goto err_dma's. > err = -EIO; > - adapter->hw.hw_addr = ioremap(mmio_start, mmio_len); > + adapter->hw.hw_addr = devm_ioremap(&pdev->dev, mmio_start, mmio_len); This is correct conversion but I have no idea why the origical code did manual ioremap instead of using pci_iomap(). > - adapter->hw.flash_address = ioremap(flash_start, flash_len); > + adapter->hw.flash_address = devm_ioremap(&pdev->dev, > + flash_start, > + flash_len); Ditto. > err_dma: > pci_disable_device(pdev); > return err; err_dma can be killed. Thanks. -- tejun - To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
