]> err.no Git - linux-2.6/commitdiff
I/OAT: cleanup pci issues
authorShannon Nelson <shannon.nelson@intel.com>
Thu, 18 Oct 2007 10:07:12 +0000 (03:07 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Thu, 18 Oct 2007 21:37:32 +0000 (14:37 -0700)
Reorder the pci release actions
    Letting go of the resources in the right order helps get rid of
    occasional kernel complaints.

Fix the pci_driver object name [Randy Dunlap]
    Rename the struct pci_driver data so that false section mismatch
    warnings won't be produced.

Cc: Randy Dunlap <randy.dunlap@oracle.com>
Signed-off-by: Shannon Nelson <shannon.nelson@intel.com>
Cc: Dan Williams <dan.j.williams@intel.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
drivers/dma/ioat.c
drivers/dma/ioat_dma.c

index f7276bf2fe7eaa05051efc507e47387c9c8eda02..54fdeb7c4945cd28b4cb1892ef4b4b1b7cd527be 100644 (file)
@@ -55,9 +55,7 @@ struct ioat_device {
 
 static int __devinit ioat_probe(struct pci_dev *pdev,
                                const struct pci_device_id *id);
-#ifdef IOAT_DMA_REMOVE
 static void __devexit ioat_remove(struct pci_dev *pdev);
-#endif
 
 static int ioat_dca_enabled = 1;
 module_param(ioat_dca_enabled, int, 0644);
@@ -100,14 +98,12 @@ static void ioat_shutdown_functionality(struct pci_dev *pdev)
 
 }
 
-static struct pci_driver ioat_pci_drv = {
+static struct pci_driver ioat_pci_driver = {
        .name           = "ioatdma",
        .id_table       = ioat_pci_tbl,
        .probe          = ioat_probe,
        .shutdown       = ioat_shutdown_functionality,
-#ifdef IOAT_DMA_REMOVE
        .remove         = __devexit_p(ioat_remove),
-#endif
 };
 
 static int __devinit ioat_probe(struct pci_dev *pdev,
@@ -122,7 +118,7 @@ static int __devinit ioat_probe(struct pci_dev *pdev,
        if (err)
                goto err_enable_device;
 
-       err = pci_request_regions(pdev, ioat_pci_drv.name);
+       err = pci_request_regions(pdev, ioat_pci_driver.name);
        if (err)
                goto err_request_regions;
 
@@ -176,13 +172,11 @@ err_enable_device:
        return err;
 }
 
-#ifdef IOAT_DMA_REMOVE
 /*
  * It is unsafe to remove this module: if removed while a requested
  * dma is outstanding, esp. from tcp, it is possible to hang while
- * waiting for something that will never finish, thus hanging at
- * least one cpu.  However, if you're feeling lucky and need to do
- * some testing, this usually works just fine.
+ * waiting for something that will never finish.  However, if you're
+ * feeling lucky, this usually works just fine.
  */
 static void __devexit ioat_remove(struct pci_dev *pdev)
 {
@@ -191,21 +185,16 @@ static void __devexit ioat_remove(struct pci_dev *pdev)
        ioat_shutdown_functionality(pdev);
 
        kfree(device);
-
-       iounmap(device->iobase);
-       pci_release_regions(pdev);
-       pci_disable_device(pdev);
 }
-#endif
 
 static int __init ioat_init_module(void)
 {
-       return pci_register_driver(&ioat_pci_drv);
+       return pci_register_driver(&ioat_pci_driver);
 }
 module_init(ioat_init_module);
 
 static void __exit ioat_exit_module(void)
 {
-       pci_unregister_driver(&ioat_pci_drv);
+       pci_unregister_driver(&ioat_pci_driver);
 }
 module_exit(ioat_exit_module);
index 66c5bb53211bceef2f3494a9a43fc4f9d4b6724e..59d4344db0054b10717beefd802ec4f64bb250e9 100644 (file)
@@ -931,7 +931,6 @@ err_completion_pool:
 err_dma_pool:
        kfree(device);
 err_kzalloc:
-       iounmap(iobase);
        dev_err(&device->pdev->dev,
                "ioatdma: Intel(R) I/OAT DMA Engine initialization failed\n");
        return NULL;
@@ -949,6 +948,10 @@ void ioat_dma_remove(struct ioatdma_device *device)
        pci_pool_destroy(device->dma_pool);
        pci_pool_destroy(device->completion_pool);
 
+       iounmap(device->reg_base);
+       pci_release_regions(device->pdev);
+       pci_disable_device(device->pdev);
+
        list_for_each_entry_safe(chan, _chan,
                                 &device->common.channels, device_node) {
                ioat_chan = to_ioat_chan(chan);