system/linux
system/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux synced 2024-09-20 11:07:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

I/OAT: cleanup pci issues

Browse source 
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>
This commit is contained in:
Shannon Nelson 2007-10-18 03:07:12 -07:00 committed by Linus Torvalds
parent d8c98618f4
commit 7df7cf0676
2 changed files with 10 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
drivers/dma/ioat.c
View file

@ -55,9 +55,7 @@ struct ioat_device {
static int __devinit ioat_probe(struct pci_dev *pdev, static int __devinit ioat_probe(struct pci_dev *pdev,
const struct pci_device_id *id); const struct pci_device_id *id);
#ifdef IOAT_DMA_REMOVE
static void __devexit ioat_remove(struct pci_dev *pdev); static void __devexit ioat_remove(struct pci_dev *pdev);
#endif
static int ioat_dca_enabled = 1; static int ioat_dca_enabled = 1;
module_param(ioat_dca_enabled, int, 0644); 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", .name = "ioatdma",
.id_table = ioat_pci_tbl, .id_table = ioat_pci_tbl,
.probe = ioat_probe, .probe = ioat_probe,
.shutdown = ioat_shutdown_functionality, .shutdown = ioat_shutdown_functionality,
#ifdef IOAT_DMA_REMOVE
.remove = __devexit_p(ioat_remove), .remove = __devexit_p(ioat_remove),
#endif
}; };
static int __devinit ioat_probe(struct pci_dev *pdev, static int __devinit ioat_probe(struct pci_dev *pdev,
@ -122,7 +118,7 @@ static int __devinit ioat_probe(struct pci_dev *pdev,
if (err) if (err)
goto err_enable_device; goto err_enable_device;
err = pci_request_regions(pdev, ioat_pci_drv.name); err = pci_request_regions(pdev, ioat_pci_driver.name);
if (err) if (err)
goto err_request_regions; goto err_request_regions;
@ -176,13 +172,11 @@ static int __devinit ioat_probe(struct pci_dev *pdev,
return err; return err;
} }
#ifdef IOAT_DMA_REMOVE
/* /*
* It is unsafe to remove this module: if removed while a requested * It is unsafe to remove this module: if removed while a requested
* dma is outstanding, esp. from tcp, it is possible to hang while * dma is outstanding, esp. from tcp, it is possible to hang while
* waiting for something that will never finish, thus hanging at * waiting for something that will never finish. However, if you're
* least one cpu. However, if you're feeling lucky and need to do * feeling lucky, this usually works just fine.
* some testing, this usually works just fine.
*/ */
static void __devexit ioat_remove(struct pci_dev *pdev) 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); ioat_shutdown_functionality(pdev);
kfree(device); kfree(device);
iounmap(device->iobase);
pci_release_regions(pdev);
pci_disable_device(pdev);
} }
#endif
static int __init ioat_init_module(void) 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); module_init(ioat_init_module);
static void __exit ioat_exit_module(void) static void __exit ioat_exit_module(void)
{ {
pci_unregister_driver(&ioat_pci_drv); pci_unregister_driver(&ioat_pci_driver);
} }
module_exit(ioat_exit_module); module_exit(ioat_exit_module);

5
drivers/dma/ioat_dma.c
View file

@ -931,7 +931,6 @@ struct ioatdma_device *ioat_dma_probe(struct pci_dev *pdev,
err_dma_pool: err_dma_pool:
kfree(device); kfree(device);
err_kzalloc: err_kzalloc:
iounmap(iobase);
dev_err(&device->pdev->dev, dev_err(&device->pdev->dev,
"ioatdma: Intel(R) I/OAT DMA Engine initialization failed\n"); "ioatdma: Intel(R) I/OAT DMA Engine initialization failed\n");
return NULL; return NULL;
@ -949,6 +948,10 @@ void ioat_dma_remove(struct ioatdma_device *device)
pci_pool_destroy(device->dma_pool); pci_pool_destroy(device->dma_pool);
pci_pool_destroy(device->completion_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, list_for_each_entry_safe(chan, _chan,
&device->common.channels, device_node) { &device->common.channels, device_node) {
ioat_chan = to_ioat_chan(chan); ioat_chan = to_ioat_chan(chan);