aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRandy Dunlap <randy.dunlap@oracle.com>2007-06-27 17:09:56 -0400
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-06-28 14:34:53 -0400
commit92504f79a7c57b853dfb59595fd2860282f6ba1e (patch)
tree95b2a799759fd1366c834d47a50830627035dcb1
parent59faba1b316a7798a33752b3889193333f8af1a0 (diff)
IOATDMA: fix section mismatches
Rename struct pci_driver data so that false section mismatch warnings won't be produced. Sam, ISTM that depending on variable names is the weakest & worst part of modpost section checking. Should __init_refok work here? I got build errors when I tried to use it, probably because the struct pci_driver probe and remove methods are not marked "__init_refok". WARNING: drivers/dma/ioatdma.o(.data+0x10): Section mismatch: reference to .init.text: (between 'ioat_pci_drv' and 'ioat_pci_tbl') WARNING: drivers/dma/ioatdma.o(.data+0x14): Section mismatch: reference to .exit.text: (between 'ioat_pci_drv' and 'ioat_pci_tbl') Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com> Acked-by: Chris Leech <christopher.leech@intel.com> Cc: Sam Ravnborg <sam@ravnborg.org> Cc: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--drivers/dma/ioatdma.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/dma/ioatdma.c b/drivers/dma/ioatdma.c
index 8e8726104619..850014139556 100644
--- a/drivers/dma/ioatdma.c
+++ b/drivers/dma/ioatdma.c
@@ -556,7 +556,7 @@ static struct pci_device_id ioat_pci_tbl[] = {
556 { 0, } 556 { 0, }
557}; 557};
558 558
559static struct pci_driver ioat_pci_drv = { 559static struct pci_driver ioat_pci_driver = {
560 .name = "ioatdma", 560 .name = "ioatdma",
561 .id_table = ioat_pci_tbl, 561 .id_table = ioat_pci_tbl,
562 .probe = ioat_probe, 562 .probe = ioat_probe,
@@ -699,7 +699,7 @@ static int __devinit ioat_probe(struct pci_dev *pdev,
699 if (err) 699 if (err)
700 goto err_set_dma_mask; 700 goto err_set_dma_mask;
701 701
702 err = pci_request_regions(pdev, ioat_pci_drv.name); 702 err = pci_request_regions(pdev, ioat_pci_driver.name);
703 if (err) 703 if (err)
704 goto err_request_regions; 704 goto err_request_regions;
705 705
@@ -828,14 +828,14 @@ static int __init ioat_init_module(void)
828 /* if forced, worst case is that rmmod hangs */ 828 /* if forced, worst case is that rmmod hangs */
829 __unsafe(THIS_MODULE); 829 __unsafe(THIS_MODULE);
830 830
831 return pci_register_driver(&ioat_pci_drv); 831 return pci_register_driver(&ioat_pci_driver);
832} 832}
833 833
834module_init(ioat_init_module); 834module_init(ioat_init_module);
835 835
836static void __exit ioat_exit_module(void) 836static void __exit ioat_exit_module(void)
837{ 837{
838 pci_unregister_driver(&ioat_pci_drv); 838 pci_unregister_driver(&ioat_pci_driver);
839} 839}
840 840
841module_exit(ioat_exit_module); 841module_exit(ioat_exit_module);