Re: [patch 5/5][RFC] Update e1000 driver to use devres.

2007-08-03 Thread Tejun Heo 
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

[patch 5/5][RFC] Update e1000 driver to use devres.

2007-08-02 Thread Brandon Philips 
Conversion of e1000 probe() and remove() to devres.

Signed-off-by: Brandon Philips [EMAIL PROTECTED]
---
 drivers/net/e1000/e1000.h  |1 
 drivers/net/e1000/e1000_main.c |   79 -
 2 files changed, 26 insertions(+), 54 deletions(-)

Index: linux-2.6/drivers/net/e1000/e1000_main.c
===
--- linux-2.6.orig/drivers/net/e1000/e1000_main.c
+++ linux-2.6/drivers/net/e1000/e1000_main.c
@@ -868,7 +868,7 @@ e1000_probe(struct pci_dev *pdev,
int i, err, pci_using_dac;
uint16_t eeprom_data = 0;
uint16_t eeprom_apme_mask = E1000_EEPROM_APME;
-   if ((err = pci_enable_device(pdev)))
+   if ((err = pcim_enable_device(pdev)))
return err;
 
if (!(err = pci_set_dma_mask(pdev, DMA_64BIT_MASK)) 
@@ -884,14 +884,14 @@ e1000_probe(struct pci_dev *pdev,
}
 
if ((err = pci_request_regions(pdev, e1000_driver_name)))
-   goto err_pci_reg;
+   goto err_dma;
 
pci_set_master(pdev);
 
err = -ENOMEM;
-   netdev = alloc_etherdev(sizeof(struct e1000_adapter));
+   netdev = devm_alloc_etherdev(pdev-dev, sizeof(struct e1000_adapter));
if (!netdev)
-   goto err_alloc_etherdev;
+   goto err_dma;
 
SET_MODULE_OWNER(netdev);
SET_NETDEV_DEV(netdev, pdev-dev);
@@ -907,9 +907,9 @@ e1000_probe(struct pci_dev *pdev,
mmio_len = pci_resource_len(pdev, BAR_0);
 
err = -EIO;
-   adapter-hw.hw_addr = ioremap(mmio_start, mmio_len);
+   adapter-hw.hw_addr = devm_ioremap(pdev-dev, mmio_start, mmio_len);
if (!adapter-hw.hw_addr)
-   goto err_ioremap;
+   goto err_dma;
 
for (i = BAR_1; i = BAR_5; i++) {
if (pci_resource_len(pdev, i) == 0)
@@ -952,7 +952,7 @@ e1000_probe(struct pci_dev *pdev,
/* setup the private structure */
 
if ((err = e1000_sw_init(adapter)))
-   goto err_sw_init;
+   goto err_dma;
 
err = -EIO;
/* Flash BAR mapping must happen after e1000_sw_init
@@ -961,7 +961,9 @@ e1000_probe(struct pci_dev *pdev,
   (pci_resource_flags(pdev, 1)  IORESOURCE_MEM)) {
flash_start = pci_resource_start(pdev, 1);
flash_len = pci_resource_len(pdev, 1);
-   adapter-hw.flash_address = ioremap(flash_start, flash_len);
+   adapter-hw.flash_address = devm_ioremap(pdev-dev,
+   flash_start,
+   flash_len);
if (!adapter-hw.flash_address)
goto err_flashmap;
}
@@ -1163,27 +1165,11 @@ err_register:
 err_eeprom:
if (!e1000_check_phy_reset_block(adapter-hw))
e1000_phy_hw_reset(adapter-hw);
-
-   if (adapter-hw.flash_address)
-   iounmap(adapter-hw.flash_address);
 err_flashmap:
 #ifdef CONFIG_E1000_NAPI
for (i = 0; i  adapter-num_rx_queues; i++)
dev_put(adapter-polling_netdev[i]);
 #endif
-
-   kfree(adapter-tx_ring);
-   kfree(adapter-rx_ring);
-#ifdef CONFIG_E1000_NAPI
-   kfree(adapter-polling_netdev);
-#endif
-err_sw_init:
-   iounmap(adapter-hw.hw_addr);
-err_ioremap:
-   free_netdev(netdev);
-err_alloc_etherdev:
-   pci_release_regions(pdev);
-err_pci_reg:
 err_dma:
pci_disable_device(pdev);
return err;
@@ -1224,21 +1210,6 @@ e1000_remove(struct pci_dev *pdev)
 
if (!e1000_check_phy_reset_block(adapter-hw))
e1000_phy_hw_reset(adapter-hw);
-
-   kfree(adapter-tx_ring);
-   kfree(adapter-rx_ring);
-#ifdef CONFIG_E1000_NAPI
-   kfree(adapter-polling_netdev);
-#endif
-
-   iounmap(adapter-hw.hw_addr);
-   if (adapter-hw.flash_address)
-   iounmap(adapter-hw.flash_address);
-   pci_release_regions(pdev);
-
-   free_netdev(netdev);
-
-   pci_disable_device(pdev);
 }
 
 /**
@@ -1350,27 +1321,27 @@ e1000_sw_init(struct e1000_adapter *adap
 static int __devinit
 e1000_alloc_queues(struct e1000_adapter *adapter)
 {
-   adapter-tx_ring = kcalloc(adapter-num_tx_queues,
-  sizeof(struct e1000_tx_ring), GFP_KERNEL);
+   adapter-tx_ring = devm_kcalloc(adapter-pdev-dev,
+   adapter-num_tx_queues,
+   sizeof(struct e1000_tx_ring),
+   GFP_KERNEL);
if (!adapter-tx_ring)
return -ENOMEM;
 
-   adapter-rx_ring = kcalloc(adapter-num_rx_queues,
-  sizeof(struct e1000_rx_ring), GFP_KERNEL);
-   if (!adapter-rx_ring) {
-   kfree(adapter-tx_ring);
+   adapter-rx_ring = devm_kcalloc(adapter-pdev-dev,
+   adapter-num_rx_queues,
+