* [BK PATCH] PCI fixes for 2.6.0-test2 @ 2003-08-01 19:29 Greg KH 2003-08-01 19:31 ` [PATCH] " Greg KH 0 siblings, 1 reply; 9+ messages in thread From: Greg KH @ 2003-08-01 19:29 UTC (permalink / raw) To: torvalds; +Cc: linux-kernel Hi, I turns out the we can not mark pci_device_id variables as __initdata or __devinitdata due to the way the pci probe functions work (the .id pointer can be looked at after init runs if a pci module is loaded by the user.) We had the same issue come up with USB device ids a while ago and we had to make this same fix. I think 2.4 might also have this problem, but haven't had the time to look into it yet or not. So these patches fix up all the pci_device_id references that I could find in the kernel tree that are wrong. I might have missed a few due to the different merges happening, so there might be more patches coming later to catch the stragglers. Thanks to Andrew Morton and Jeff Garzik for talking it over about this problem and notifying me of it. The pnp_id variables also have the same problem, and Adam is fixing them all up right now. Any other subsystem that uses the driver core for probing needs to be checked to make sure this problem isn't there too. I've also added a documentation and pci_ids.h patch to this tree, as they had been floating around for a while. Please pull from: bk://kernel.bkbits.net/gregkh/linux/pci-2.6 thanks, greg k-h p.s. I'll send these as patches in response to this email to lkml for those who want to see them. Documentation/DMA-mapping.txt | 2 arch/mips/vr41xx/common/vrc4173.c | 2 drivers/atm/eni.c | 2 drivers/atm/firestream.c | 5 drivers/atm/he.c | 2 drivers/atm/idt77252.c | 2 drivers/atm/iphase.c | 2 drivers/block/umem.c | 2 drivers/char/agp/ali-agp.c | 2 drivers/char/agp/amd-k7-agp.c | 2 drivers/char/agp/amd-k8-agp.c | 2 drivers/char/agp/i460-agp.c | 2 drivers/char/agp/intel-agp.c | 2 drivers/char/agp/nvidia-agp.c | 2 drivers/char/agp/sworks-agp.c | 2 drivers/char/epca.c | 2 drivers/char/synclink.c | 4 drivers/char/synclinkmp.c | 4 drivers/char/watchdog/wdt_pci.c | 10 drivers/i2c/busses/i2c-ali1535.c | 2 drivers/i2c/busses/i2c-ali15x3.c | 2 drivers/i2c/busses/i2c-amd756.c | 2 drivers/i2c/busses/i2c-amd8111.c | 2 drivers/i2c/busses/i2c-i801.c | 2 drivers/i2c/busses/i2c-piix4.c | 2 drivers/i2c/busses/i2c-sis96x.c | 2 drivers/i2c/busses/i2c-viapro.c | 2 drivers/i2c/chips/via686a.c | 2 drivers/i2c/i2c-prosavage.c | 2 drivers/ide/pci/aec62xx.c | 2 drivers/ide/pci/alim15x3.c | 2 drivers/ide/pci/amd74xx.c | 2 drivers/ide/pci/cmd64x.c | 2 drivers/ide/pci/cs5520.c | 2 drivers/ide/pci/cs5530.c | 2 drivers/ide/pci/cy82c693.c | 2 drivers/ide/pci/generic.c | 2 drivers/ide/pci/hpt34x.c | 2 drivers/ide/pci/hpt366.c | 2 drivers/ide/pci/it8172.c | 2 drivers/ide/pci/ns87415.c | 2 drivers/ide/pci/opti621.c | 2 drivers/ide/pci/pdc202xx_new.c | 2 drivers/ide/pci/pdc202xx_old.c | 2 drivers/ide/pci/pdcadma.c | 2 drivers/ide/pci/piix.c | 2 drivers/ide/pci/rz1000.c | 2 drivers/ide/pci/sc1200.c | 2 drivers/ide/pci/serverworks.c | 2 drivers/ide/pci/siimage.c | 2 drivers/ide/pci/sis5513.c | 2 drivers/ide/pci/sl82c105.c | 2 drivers/ide/pci/slc90e66.c | 2 drivers/ide/pci/triflex.h | 2 drivers/ide/pci/trm290.c | 2 drivers/ide/pci/via82cxxx.c | 2 drivers/ieee1394/ohci1394.c | 2 drivers/ieee1394/pcilynx.c | 2 drivers/input/gameport/cs461x.c | 2 drivers/input/gameport/emu10k1-gp.c | 2 drivers/input/gameport/fm801-gp.c | 2 drivers/input/gameport/vortex.c | 2 drivers/isdn/hardware/avm/b1pci.c | 2 drivers/isdn/hardware/avm/c4.c | 2 drivers/isdn/hardware/avm/t1pci.c | 2 drivers/isdn/hardware/eicon/divasmain.c | 2 drivers/isdn/hisax/hisax_fcpcipnp.c | 2 drivers/isdn/hisax/hisax_hfcpci.c | 2 drivers/isdn/tpam/tpam_main.c | 2 drivers/media/radio/radio-maxiradio.c | 2 drivers/media/video/bttv-driver.c | 2 drivers/media/video/meye.c | 2 drivers/mtd/maps/amd76xrom.c | 2 drivers/mtd/maps/ich2rom.c | 2 drivers/mtd/maps/pci.c | 2 drivers/mtd/maps/scb2_flash.c | 4 drivers/net/3c59x.c | 4 drivers/net/8139cp.c | 2 drivers/net/8139too.c | 2 drivers/net/acenic.c | 2 drivers/net/amd8111e.c | 2 drivers/net/arcnet/com20020-pci.c | 2 drivers/net/b44.c | 2 drivers/net/defxx.c | 2 drivers/net/dl2k.h | 2 drivers/net/e100/e100_main.c | 2 drivers/net/e1000/e1000_main.c | 2 drivers/net/eepro100.c | 2 drivers/net/epic100.c | 2 drivers/net/fealnx.c | 2 drivers/net/hamachi.c | 2 drivers/net/ioc3-eth.c | 2 drivers/net/irda/donauboe.c | 2 drivers/net/irda/toshoboe.c | 2 drivers/net/irda/vlsi_ir.c | 2 drivers/net/ixgb/ixgb_main.c | 2 drivers/net/natsemi.c | 2 drivers/net/ne2k-pci.c | 2 drivers/net/ns83820.c | 2 drivers/net/pci-skeleton.c | 2 drivers/net/pcnet32.c | 2 drivers/net/r8169.c | 2 drivers/net/rcpci45.c | 2 drivers/net/rrunner.c | 2 drivers/net/sis900.c | 2 drivers/net/sk98lin/skge.c | 2 drivers/net/starfire.c | 2 drivers/net/sundance.c | 2 drivers/net/sungem.c | 2 drivers/net/sunhme.c | 2 drivers/net/tc35815.c | 2 drivers/net/tg3.c | 3 drivers/net/tlan.c | 2 drivers/net/tokenring/3c359.c | 4 drivers/net/tokenring/abyss.c | 2 drivers/net/tokenring/lanstreamer.c | 2 drivers/net/tokenring/olympic.c | 2 drivers/net/tokenring/tmspci.c | 2 drivers/net/tulip/de2104x.c | 2 drivers/net/tulip/dmfe.c | 2 drivers/net/tulip/tulip_core.c | 2 drivers/net/tulip/winbond-840.c | 2 drivers/net/tulip/xircom_cb.c | 2 drivers/net/tulip/xircom_tulip_cb.c | 2 drivers/net/typhoon.c | 2 drivers/net/via-rhine.c | 2 drivers/net/wan/dscc4.c | 4 drivers/net/wan/farsync.c | 2 drivers/net/wan/lmc/lmc_main.c | 2 drivers/net/wan/pc300_drv.c | 4 drivers/net/wireless/airo.c | 2 drivers/net/wireless/orinoco_pci.c | 2 drivers/net/wireless/orinoco_plx.c | 2 drivers/net/wireless/orinoco_tmd.c | 2 drivers/net/yellowfin.c | 2 drivers/parisc/eisa.c | 2 drivers/parisc/superio.c | 2 drivers/parport/parport_pc.c | 2 drivers/parport/parport_serial.c | 2 drivers/pci/hotplug/cpcihp_zt5550.c | 5 drivers/pci/hotplug/cpqphp_core.c | 2 drivers/pci/hotplug/ibmphp_ebda.c | 2 drivers/pcmcia/yenta_socket.c | 2 drivers/scsi/dc395x.c | 4 drivers/scsi/gdth.c | 4 drivers/scsi/ips.c | 2 drivers/scsi/nsp32.c | 2 drivers/scsi/tmscsim.c | 4 drivers/serial/8250_pci.c | 2 drivers/video/aty/aty128fb.c | 2 drivers/video/chipsfb.c | 2 drivers/video/console/sticore.c | 2 drivers/video/cyber2000fb.c | 2 drivers/video/i810/i810_main.h | 34 +- drivers/video/imsttfb.c | 2 drivers/video/matrox/matroxfb_base.c | 2 drivers/video/neofb.c | 2 drivers/video/radeonfb.c | 2 drivers/video/riva/fbdev.c | 2 drivers/video/sstfb.c | 2 drivers/video/tdfxfb.c | 4 drivers/video/tridentfb.c | 2 include/linux/pci_ids.h | 2 sound/oss/ad1889.c | 2 sound/oss/ali5455.c | 2 sound/oss/btaudio.c | 2 sound/oss/cs4281/cs4281m.c | 2 sound/oss/cs46xx.c | 2 sound/oss/es1370.c | 2 sound/oss/es1371.c | 2 sound/oss/esssolo1.c | 2 sound/oss/forte.c | 2 sound/oss/i810_audio.c | 2 sound/oss/ite8172.c | 2 sound/oss/kahlua.c | 2 sound/oss/maestro.c | 4 sound/oss/maestro3.c | 2 sound/oss/nec_vrc5477.c | 2 sound/oss/nm256_audio.c | 2 sound/oss/rme96xx.c | 2 sound/oss/sonicvibes.c | 4 sound/oss/trident.c | 2 sound/oss/via82cxxx_audio.c | 2 sound/oss/ymfpci.c | 2 sound/pci/ali5451/ali5451.c | 54 +--- sound/pci/als4000.c | 2 sound/pci/azt3328.c | 2 sound/pci/cmipci.c | 6 sound/pci/cs4281.c | 76 ++--- sound/pci/cs46xx/cs46xx.c | 15 - sound/pci/emu10k1/emu10k1.c | 12 sound/pci/ens1370.c | 12 sound/pci/es1938.c | 8 sound/pci/es1968.c | 50 +-- sound/pci/fm801.c | 2 sound/pci/ice1712/ice1712.c | 2 sound/pci/ice1712/ice1724.c | 6 sound/pci/intel8x0.c | 360 ++++++++++++++++----------- sound/pci/korg1212/korg1212.c | 2 sound/pci/maestro3.c | 102 ++++--- sound/pci/nm256/nm256.c | 15 - sound/pci/rme32.c | 2 sound/pci/rme96.c | 20 - sound/pci/rme9652/hdsp.c | 419 +++++++++++++++++++------------- sound/pci/rme9652/rme9652.c | 80 +++--- sound/pci/sonicvibes.c | 8 sound/pci/trident/trident.c | 17 - sound/pci/via82xx.c | 8 sound/pci/vx222/vx222.c | 2 sound/pci/ymfpci/ymfpci.c | 17 - 210 files changed, 913 insertions(+), 827 deletions(-) ----- Greg Kroah-Hartman: o PCI: merge fixups o PCI: pci_device_id can not be marked __devinitdata o PCI: pci_device_id can not be marked __devinitdata o PCI: pci_device_id can not be marked __devinitdata o PCI: pci_device_id can not be marked __devinitdata o PCI: pci_device_id can not be marked __devinitdata o PCI: pci_device_id can not be marked __devinitdata. Fixes up sound/* Mitchell Blank Jr.: o PCI: add 2 entries to pci_ids.h o PCI: Trivial DMA-mapping.txt fix ^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH] PCI fixes for 2.6.0-test2 2003-08-01 19:29 [BK PATCH] PCI fixes for 2.6.0-test2 Greg KH @ 2003-08-01 19:31 ` Greg KH 2003-08-01 19:31 ` Greg KH 0 siblings, 1 reply; 9+ messages in thread From: Greg KH @ 2003-08-01 19:31 UTC (permalink / raw) To: linux-kernel ChangeSet 1.1547.10.1, 2003/07/31 16:05:44-07:00, greg@kroah.com [PATCH] PCI: pci_device_id can not be marked __devinitdata. Fixes up sound/* sound/oss/ad1889.c | 2 +- sound/oss/ali5455.c | 2 +- sound/oss/btaudio.c | 2 +- sound/oss/cs4281/cs4281m.c | 2 +- sound/oss/cs46xx.c | 2 +- sound/oss/es1370.c | 2 +- sound/oss/es1371.c | 2 +- sound/oss/esssolo1.c | 2 +- sound/oss/forte.c | 2 +- sound/oss/i810_audio.c | 2 +- sound/oss/ite8172.c | 2 +- sound/oss/kahlua.c | 2 +- sound/oss/maestro.c | 2 +- sound/oss/maestro3.c | 2 +- sound/oss/nec_vrc5477.c | 2 +- sound/oss/nm256_audio.c | 2 +- sound/oss/rme96xx.c | 2 +- sound/oss/sonicvibes.c | 2 +- sound/oss/trident.c | 2 +- sound/oss/via82cxxx_audio.c | 2 +- sound/oss/ymfpci.c | 2 +- sound/pci/ali5451/ali5451.c | 2 +- sound/pci/als4000.c | 2 +- sound/pci/azt3328.c | 2 +- sound/pci/cmipci.c | 2 +- sound/pci/cs4281.c | 2 +- sound/pci/cs46xx/cs46xx.c | 2 +- sound/pci/emu10k1/emu10k1.c | 2 +- sound/pci/ens1370.c | 2 +- sound/pci/es1938.c | 2 +- sound/pci/es1968.c | 2 +- sound/pci/fm801.c | 2 +- sound/pci/ice1712/ice1712.c | 2 +- sound/pci/ice1712/ice1724.c | 2 +- sound/pci/intel8x0.c | 4 ++-- sound/pci/korg1212/korg1212.c | 2 +- sound/pci/maestro3.c | 2 +- sound/pci/nm256/nm256.c | 2 +- sound/pci/rme32.c | 2 +- sound/pci/rme96.c | 2 +- sound/pci/rme9652/hdsp.c | 2 +- sound/pci/rme9652/rme9652.c | 2 +- sound/pci/sonicvibes.c | 2 +- sound/pci/trident/trident.c | 2 +- sound/pci/via82xx.c | 2 +- sound/pci/vx222/vx222.c | 2 +- sound/pci/ymfpci/ymfpci.c | 2 +- 47 files changed, 48 insertions(+), 48 deletions(-) diff -Nru a/sound/oss/ad1889.c b/sound/oss/ad1889.c --- a/sound/oss/ad1889.c Fri Aug 1 12:19:19 2003 +++ b/sound/oss/ad1889.c Fri Aug 1 12:19:19 2003 @@ -918,7 +918,7 @@ /************************* PCI interfaces ****************************** */ /* PCI device table */ -static struct pci_device_id ad1889_id_tbl[] __devinitdata = { +static struct pci_device_id ad1889_id_tbl[] = { { PCI_VENDOR_ID_ANALOG_DEVICES, PCI_DEVICE_ID_AD1889JS, PCI_ANY_ID, PCI_ANY_ID, 0, 0, (unsigned long)DEVNAME }, { }, diff -Nru a/sound/oss/ali5455.c b/sound/oss/ali5455.c --- a/sound/oss/ali5455.c Fri Aug 1 12:19:19 2003 +++ b/sound/oss/ali5455.c Fri Aug 1 12:19:19 2003 @@ -216,7 +216,7 @@ "ALI 5455" }; -static struct pci_device_id ali_pci_tbl[] __initdata = { +static struct pci_device_id ali_pci_tbl[] = { {PCI_VENDOR_ID_ALI, PCI_DEVICE_ID_ALI_5455, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ALI5455}, {0,} diff -Nru a/sound/oss/btaudio.c b/sound/oss/btaudio.c --- a/sound/oss/btaudio.c Fri Aug 1 12:19:19 2003 +++ b/sound/oss/btaudio.c Fri Aug 1 12:19:19 2003 @@ -1060,7 +1060,7 @@ /* -------------------------------------------------------------- */ -static struct pci_device_id btaudio_pci_tbl[] __devinitdata = { +static struct pci_device_id btaudio_pci_tbl[] = { { .vendor = PCI_VENDOR_ID_BROOKTREE, .device = 0x0878, diff -Nru a/sound/oss/cs4281/cs4281m.c b/sound/oss/cs4281/cs4281m.c --- a/sound/oss/cs4281/cs4281m.c Fri Aug 1 12:19:19 2003 +++ b/sound/oss/cs4281/cs4281m.c Fri Aug 1 12:19:19 2003 @@ -4458,7 +4458,7 @@ "cs4281: cs4281_remove()-: remove successful\n")); } -static struct pci_device_id cs4281_pci_tbl[] __devinitdata = { +static struct pci_device_id cs4281_pci_tbl[] = { { .vendor = PCI_VENDOR_ID_CIRRUS, .device = PCI_DEVICE_ID_CRYSTAL_CS4281, diff -Nru a/sound/oss/cs46xx.c b/sound/oss/cs46xx.c --- a/sound/oss/cs46xx.c Fri Aug 1 12:19:18 2003 +++ b/sound/oss/cs46xx.c Fri Aug 1 12:19:18 2003 @@ -5705,7 +5705,7 @@ CS46XX_4615, /* same as 4624 */ }; -static struct pci_device_id cs46xx_pci_tbl[] __devinitdata = { +static struct pci_device_id cs46xx_pci_tbl[] = { { .vendor = PCI_VENDOR_ID_CIRRUS, .device = PCI_DEVICE_ID_CIRRUS_4610, diff -Nru a/sound/oss/es1370.c b/sound/oss/es1370.c --- a/sound/oss/es1370.c Fri Aug 1 12:19:19 2003 +++ b/sound/oss/es1370.c Fri Aug 1 12:19:19 2003 @@ -2719,7 +2719,7 @@ pci_set_drvdata(dev, NULL); } -static struct pci_device_id id_table[] __devinitdata = { +static struct pci_device_id id_table[] = { { PCI_VENDOR_ID_ENSONIQ, PCI_DEVICE_ID_ENSONIQ_ES1370, PCI_ANY_ID, PCI_ANY_ID, 0, 0 }, { 0, } }; diff -Nru a/sound/oss/es1371.c b/sound/oss/es1371.c --- a/sound/oss/es1371.c Fri Aug 1 12:19:19 2003 +++ b/sound/oss/es1371.c Fri Aug 1 12:19:19 2003 @@ -3030,7 +3030,7 @@ pci_set_drvdata(dev, NULL); } -static struct pci_device_id id_table[] __devinitdata = { +static struct pci_device_id id_table[] = { { PCI_VENDOR_ID_ENSONIQ, PCI_DEVICE_ID_ENSONIQ_ES1371, PCI_ANY_ID, PCI_ANY_ID, 0, 0 }, { PCI_VENDOR_ID_ENSONIQ, PCI_DEVICE_ID_ENSONIQ_CT5880, PCI_ANY_ID, PCI_ANY_ID, 0, 0 }, { PCI_VENDOR_ID_ECTIVA, PCI_DEVICE_ID_ECTIVA_EV1938, PCI_ANY_ID, PCI_ANY_ID, 0, 0 }, diff -Nru a/sound/oss/esssolo1.c b/sound/oss/esssolo1.c --- a/sound/oss/esssolo1.c Fri Aug 1 12:19:18 2003 +++ b/sound/oss/esssolo1.c Fri Aug 1 12:19:18 2003 @@ -2436,7 +2436,7 @@ pci_set_drvdata(dev, NULL); } -static struct pci_device_id id_table[] __devinitdata = { +static struct pci_device_id id_table[] = { { PCI_VENDOR_ID_ESS, PCI_DEVICE_ID_ESS_SOLO1, PCI_ANY_ID, PCI_ANY_ID, 0, 0 }, { 0, } }; diff -Nru a/sound/oss/forte.c b/sound/oss/forte.c --- a/sound/oss/forte.c Fri Aug 1 12:19:19 2003 +++ b/sound/oss/forte.c Fri Aug 1 12:19:19 2003 @@ -2092,7 +2092,7 @@ } -static struct pci_device_id forte_pci_ids[] __devinitdata = { +static struct pci_device_id forte_pci_ids[] = { { 0x1319, 0x0801, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0, }, { 0, } }; diff -Nru a/sound/oss/i810_audio.c b/sound/oss/i810_audio.c --- a/sound/oss/i810_audio.c Fri Aug 1 12:19:19 2003 +++ b/sound/oss/i810_audio.c Fri Aug 1 12:19:19 2003 @@ -316,7 +316,7 @@ /*@FIXME to be verified*/ { 3, 0x0001 }, /* AMD8111 */ }; -static struct pci_device_id i810_pci_tbl [] __initdata = { +static struct pci_device_id i810_pci_tbl [] = { {PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ICH82801AA}, {PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82901, diff -Nru a/sound/oss/ite8172.c b/sound/oss/ite8172.c --- a/sound/oss/ite8172.c Fri Aug 1 12:19:19 2003 +++ b/sound/oss/ite8172.c Fri Aug 1 12:19:19 2003 @@ -2187,7 +2187,7 @@ -static struct pci_device_id id_table[] __devinitdata = { +static struct pci_device_id id_table[] = { { PCI_VENDOR_ID_ITE, PCI_DEVICE_ID_ITE_IT8172G_AUDIO, PCI_ANY_ID, PCI_ANY_ID, 0, 0 }, { 0, } diff -Nru a/sound/oss/kahlua.c b/sound/oss/kahlua.c --- a/sound/oss/kahlua.c Fri Aug 1 12:19:19 2003 +++ b/sound/oss/kahlua.c Fri Aug 1 12:19:19 2003 @@ -195,7 +195,7 @@ * 5530 only. The 5510/5520 decode is different. */ -static struct pci_device_id id_tbl[] __devinitdata = { +static struct pci_device_id id_tbl[] = { { PCI_VENDOR_ID_CYRIX, PCI_DEVICE_ID_CYRIX_5530_AUDIO, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 }, { } }; diff -Nru a/sound/oss/maestro.c b/sound/oss/maestro.c --- a/sound/oss/maestro.c Fri Aug 1 12:19:19 2003 +++ b/sound/oss/maestro.c Fri Aug 1 12:19:19 2003 @@ -3610,7 +3610,7 @@ pci_set_drvdata(pcidev,NULL); } -static struct pci_device_id maestro_pci_tbl[] __devinitdata = { +static struct pci_device_id maestro_pci_tbl[] = { {PCI_VENDOR_ESS, PCI_DEVICE_ID_ESS_ESS1968, PCI_ANY_ID, PCI_ANY_ID, 0, 0, TYPE_MAESTRO2}, {PCI_VENDOR_ESS, PCI_DEVICE_ID_ESS_ESS1978, PCI_ANY_ID, PCI_ANY_ID, 0, 0, TYPE_MAESTRO2E}, {PCI_VENDOR_ESS_OLD, PCI_DEVICE_ID_ESS_ESS0100, PCI_ANY_ID, PCI_ANY_ID, 0, 0, TYPE_MAESTRO}, diff -Nru a/sound/oss/maestro3.c b/sound/oss/maestro3.c --- a/sound/oss/maestro3.c Fri Aug 1 12:19:19 2003 +++ b/sound/oss/maestro3.c Fri Aug 1 12:19:19 2003 @@ -328,7 +328,7 @@ .driver_data = TYPE, \ } -static struct pci_device_id m3_id_table[] __initdata = { +static struct pci_device_id m3_id_table[] = { M3_DEVICE(0x1988, ESS_ALLEGRO), M3_DEVICE(0x1998, ESS_MAESTRO3), M3_DEVICE(0x199a, ESS_MAESTRO3HW), diff -Nru a/sound/oss/nec_vrc5477.c b/sound/oss/nec_vrc5477.c --- a/sound/oss/nec_vrc5477.c Fri Aug 1 12:19:19 2003 +++ b/sound/oss/nec_vrc5477.c Fri Aug 1 12:19:19 2003 @@ -1989,7 +1989,7 @@ } -static struct pci_device_id id_table[] __devinitdata = { +static struct pci_device_id id_table[] = { { PCI_VENDOR_ID_NEC, PCI_DEVICE_ID_NEC_VRC5477_AC97, PCI_ANY_ID, PCI_ANY_ID, 0, 0 }, { 0, } diff -Nru a/sound/oss/nm256_audio.c b/sound/oss/nm256_audio.c --- a/sound/oss/nm256_audio.c Fri Aug 1 12:19:19 2003 +++ b/sound/oss/nm256_audio.c Fri Aug 1 12:19:19 2003 @@ -1660,7 +1660,7 @@ .local_qlen = nm256_audio_local_qlen, }; -static struct pci_device_id nm256_pci_tbl[] __devinitdata = { +static struct pci_device_id nm256_pci_tbl[] = { {PCI_VENDOR_ID_NEOMAGIC, PCI_DEVICE_ID_NEOMAGIC_NM256AV_AUDIO, PCI_ANY_ID, PCI_ANY_ID, 0, 0}, {PCI_VENDOR_ID_NEOMAGIC, PCI_DEVICE_ID_NEOMAGIC_NM256ZX_AUDIO, diff -Nru a/sound/oss/rme96xx.c b/sound/oss/rme96xx.c --- a/sound/oss/rme96xx.c Fri Aug 1 12:19:19 2003 +++ b/sound/oss/rme96xx.c Fri Aug 1 12:19:19 2003 @@ -1072,7 +1072,7 @@ #define PCI_ANY_ID 0 #endif -static struct pci_device_id id_table[] __devinitdata = { +static struct pci_device_id id_table[] = { { .vendor = PCI_VENDOR_ID_RME, .device = PCI_DEVICE_ID_RME9652, diff -Nru a/sound/oss/sonicvibes.c b/sound/oss/sonicvibes.c --- a/sound/oss/sonicvibes.c Fri Aug 1 12:19:19 2003 +++ b/sound/oss/sonicvibes.c Fri Aug 1 12:19:19 2003 @@ -2707,7 +2707,7 @@ pci_set_drvdata(dev, NULL); } -static struct pci_device_id id_table[] __devinitdata = { +static struct pci_device_id id_table[] = { { PCI_VENDOR_ID_S3, PCI_DEVICE_ID_S3_SONICVIBES, PCI_ANY_ID, PCI_ANY_ID, 0, 0 }, { 0, } }; diff -Nru a/sound/oss/trident.c b/sound/oss/trident.c --- a/sound/oss/trident.c Fri Aug 1 12:19:19 2003 +++ b/sound/oss/trident.c Fri Aug 1 12:19:19 2003 @@ -265,7 +265,7 @@ "Tvia/IGST CyberPro 5050" }; -static struct pci_device_id trident_pci_tbl [] __devinitdata = { +static struct pci_device_id trident_pci_tbl [] = { {PCI_VENDOR_ID_TRIDENT, PCI_DEVICE_ID_TRIDENT_4DWAVE_DX, PCI_ANY_ID, PCI_ANY_ID, 0, 0, TRIDENT_4D_DX}, {PCI_VENDOR_ID_TRIDENT, PCI_DEVICE_ID_TRIDENT_4DWAVE_NX, diff -Nru a/sound/oss/via82cxxx_audio.c b/sound/oss/via82cxxx_audio.c --- a/sound/oss/via82cxxx_audio.c Fri Aug 1 12:19:19 2003 +++ b/sound/oss/via82cxxx_audio.c Fri Aug 1 12:19:19 2003 @@ -387,7 +387,7 @@ */ -static struct pci_device_id via_pci_tbl[] __initdata = { +static struct pci_device_id via_pci_tbl[] = { { PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_82C686_5, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, { PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_8233_5, diff -Nru a/sound/oss/ymfpci.c b/sound/oss/ymfpci.c --- a/sound/oss/ymfpci.c Fri Aug 1 12:19:19 2003 +++ b/sound/oss/ymfpci.c Fri Aug 1 12:19:19 2003 @@ -105,7 +105,7 @@ * constants */ -static struct pci_device_id ymf_id_tbl[] __devinitdata = { +static struct pci_device_id ymf_id_tbl[] = { #define DEV(v, d, data) \ { PCI_VENDOR_ID_##v, PCI_DEVICE_ID_##v##_##d, PCI_ANY_ID, PCI_ANY_ID, 0, 0, (unsigned long)data } DEV (YAMAHA, 724, "YMF724"), diff -Nru a/sound/pci/ali5451/ali5451.c b/sound/pci/ali5451/ali5451.c --- a/sound/pci/ali5451/ali5451.c Fri Aug 1 12:19:19 2003 +++ b/sound/pci/ali5451/ali5451.c Fri Aug 1 12:19:19 2003 @@ -277,7 +277,7 @@ #endif }; -static struct pci_device_id snd_ali_ids[] __devinitdata = { +static struct pci_device_id snd_ali_ids[] = { {0x10b9, 0x5451, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0, }, {0, } }; diff -Nru a/sound/pci/als4000.c b/sound/pci/als4000.c --- a/sound/pci/als4000.c Fri Aug 1 12:19:19 2003 +++ b/sound/pci/als4000.c Fri Aug 1 12:19:19 2003 @@ -107,7 +107,7 @@ unsigned long gcr; } snd_card_als4000_t; -static struct pci_device_id snd_als4000_ids[] __devinitdata = { +static struct pci_device_id snd_als4000_ids[] = { { 0x4005, 0x4000, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0, }, /* ALS4000 */ { 0, } }; diff -Nru a/sound/pci/azt3328.c b/sound/pci/azt3328.c --- a/sound/pci/azt3328.c Fri Aug 1 12:19:19 2003 +++ b/sound/pci/azt3328.c Fri Aug 1 12:19:19 2003 @@ -205,7 +205,7 @@ spinlock_t reg_lock; }; -static struct pci_device_id snd_azf3328_ids[] __devinitdata = { +static struct pci_device_id snd_azf3328_ids[] = { { 0x122D, 0x50DC, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 }, /* PCI168/3328 */ { 0x122D, 0x80DA, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 }, /* 3328 */ { 0, } diff -Nru a/sound/pci/cmipci.c b/sound/pci/cmipci.c --- a/sound/pci/cmipci.c Fri Aug 1 12:19:19 2003 +++ b/sound/pci/cmipci.c Fri Aug 1 12:19:19 2003 @@ -2819,7 +2819,7 @@ } -static struct pci_device_id snd_cmipci_ids[] __devinitdata = { +static struct pci_device_id snd_cmipci_ids[] = { {PCI_VENDOR_ID_CMEDIA, PCI_DEVICE_ID_CMEDIA_CM8338A, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, {PCI_VENDOR_ID_CMEDIA, PCI_DEVICE_ID_CMEDIA_CM8338B, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, {PCI_VENDOR_ID_CMEDIA, PCI_DEVICE_ID_CMEDIA_CM8738, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, diff -Nru a/sound/pci/cs4281.c b/sound/pci/cs4281.c --- a/sound/pci/cs4281.c Fri Aug 1 12:19:19 2003 +++ b/sound/pci/cs4281.c Fri Aug 1 12:19:19 2003 @@ -513,7 +513,7 @@ static irqreturn_t snd_cs4281_interrupt(int irq, void *dev_id, struct pt_regs *regs); -static struct pci_device_id snd_cs4281_ids[] __devinitdata = { +static struct pci_device_id snd_cs4281_ids[] = { { 0x1013, 0x6005, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0, }, /* CS4281 */ { 0, } }; diff -Nru a/sound/pci/cs46xx/cs46xx.c b/sound/pci/cs46xx/cs46xx.c --- a/sound/pci/cs46xx/cs46xx.c Fri Aug 1 12:19:19 2003 +++ b/sound/pci/cs46xx/cs46xx.c Fri Aug 1 12:19:19 2003 @@ -72,7 +72,7 @@ MODULE_PARM_DESC(mmap_valid, "Support OSS mmap."); MODULE_PARM_SYNTAX(mmap_valid, SNDRV_ENABLED "," SNDRV_BOOLEAN_FALSE_DESC); -static struct pci_device_id snd_cs46xx_ids[] __devinitdata = { +static struct pci_device_id snd_cs46xx_ids[] = { { 0x1013, 0x6001, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0, }, /* CS4280 */ { 0x1013, 0x6003, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0, }, /* CS4612 */ { 0x1013, 0x6004, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0, }, /* CS4615 */ diff -Nru a/sound/pci/emu10k1/emu10k1.c b/sound/pci/emu10k1/emu10k1.c --- a/sound/pci/emu10k1/emu10k1.c Fri Aug 1 12:19:18 2003 +++ b/sound/pci/emu10k1/emu10k1.c Fri Aug 1 12:19:18 2003 @@ -78,7 +78,7 @@ MODULE_PARM_DESC(enable_ir, "Enable IR."); MODULE_PARM_SYNTAX(enable_ir, SNDRV_ENABLE_DESC); -static struct pci_device_id snd_emu10k1_ids[] __devinitdata = { +static struct pci_device_id snd_emu10k1_ids[] = { { 0x1102, 0x0002, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 }, /* EMU10K1 */ { 0x1102, 0x0006, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 }, /* Dell OEM version (EMU10K1) */ { 0x1102, 0x0004, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 1 }, /* Audigy */ diff -Nru a/sound/pci/ens1370.c b/sound/pci/ens1370.c --- a/sound/pci/ens1370.c Fri Aug 1 12:19:19 2003 +++ b/sound/pci/ens1370.c Fri Aug 1 12:19:19 2003 @@ -417,7 +417,7 @@ static irqreturn_t snd_audiopci_interrupt(int irq, void *dev_id, struct pt_regs *regs); -static struct pci_device_id snd_audiopci_ids[] __devinitdata = { +static struct pci_device_id snd_audiopci_ids[] = { #ifdef CHIP1370 { 0x1274, 0x5000, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0, }, /* ES1370 */ #endif diff -Nru a/sound/pci/es1938.c b/sound/pci/es1938.c --- a/sound/pci/es1938.c Fri Aug 1 12:19:19 2003 +++ b/sound/pci/es1938.c Fri Aug 1 12:19:19 2003 @@ -251,7 +251,7 @@ static irqreturn_t snd_es1938_interrupt(int irq, void *dev_id, struct pt_regs *regs); -static struct pci_device_id snd_es1938_ids[] __devinitdata = { +static struct pci_device_id snd_es1938_ids[] = { { 0x125d, 0x1969, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0, }, /* Solo-1 */ { 0, } }; diff -Nru a/sound/pci/es1968.c b/sound/pci/es1968.c --- a/sound/pci/es1968.c Fri Aug 1 12:19:19 2003 +++ b/sound/pci/es1968.c Fri Aug 1 12:19:19 2003 @@ -602,7 +602,7 @@ static irqreturn_t snd_es1968_interrupt(int irq, void *dev_id, struct pt_regs *regs); -static struct pci_device_id snd_es1968_ids[] __devinitdata = { +static struct pci_device_id snd_es1968_ids[] = { /* Maestro 1 */ { 0x1285, 0x0100, PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_MULTIMEDIA_AUDIO << 8, 0xffff00, TYPE_MAESTRO }, /* Maestro 2 */ diff -Nru a/sound/pci/fm801.c b/sound/pci/fm801.c --- a/sound/pci/fm801.c Fri Aug 1 12:19:19 2003 +++ b/sound/pci/fm801.c Fri Aug 1 12:19:19 2003 @@ -163,7 +163,7 @@ snd_info_entry_t *proc_entry; }; -static struct pci_device_id snd_fm801_ids[] __devinitdata = { +static struct pci_device_id snd_fm801_ids[] = { { 0x1319, 0x0801, PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_MULTIMEDIA_AUDIO << 8, 0xffff00, 0, }, /* FM801 */ { 0, } }; diff -Nru a/sound/pci/ice1712/ice1712.c b/sound/pci/ice1712/ice1712.c --- a/sound/pci/ice1712/ice1712.c Fri Aug 1 12:19:19 2003 +++ b/sound/pci/ice1712/ice1712.c Fri Aug 1 12:19:19 2003 @@ -103,7 +103,7 @@ #define PCI_DEVICE_ID_ICE_1712 0x1712 #endif -static struct pci_device_id snd_ice1712_ids[] __devinitdata = { +static struct pci_device_id snd_ice1712_ids[] = { { PCI_VENDOR_ID_ICE, PCI_DEVICE_ID_ICE_1712, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 }, /* ICE1712 */ { 0, } }; diff -Nru a/sound/pci/ice1712/ice1724.c b/sound/pci/ice1712/ice1724.c --- a/sound/pci/ice1712/ice1724.c Fri Aug 1 12:19:19 2003 +++ b/sound/pci/ice1712/ice1724.c Fri Aug 1 12:19:19 2003 @@ -77,7 +77,7 @@ #define PCI_DEVICE_ID_VT1724 0x1724 #endif -static struct pci_device_id snd_vt1724_ids[] __devinitdata = { +static struct pci_device_id snd_vt1724_ids[] = { { PCI_VENDOR_ID_ICE, PCI_DEVICE_ID_VT1724, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 }, { 0, } }; diff -Nru a/sound/pci/intel8x0.c b/sound/pci/intel8x0.c --- a/sound/pci/intel8x0.c Fri Aug 1 12:19:19 2003 +++ b/sound/pci/intel8x0.c Fri Aug 1 12:19:19 2003 @@ -395,7 +395,7 @@ #endif }; -static struct pci_device_id snd_intel8x0_ids[] __devinitdata = { +static struct pci_device_id snd_intel8x0_ids[] = { { 0x8086, 0x2415, PCI_ANY_ID, PCI_ANY_ID, 0, 0, DEVICE_INTEL }, /* 82801AA */ { 0x8086, 0x2425, PCI_ANY_ID, PCI_ANY_ID, 0, 0, DEVICE_INTEL }, /* 82901AB */ { 0x8086, 0x2445, PCI_ANY_ID, PCI_ANY_ID, 0, 0, DEVICE_INTEL }, /* 82801BA */ @@ -2479,7 +2479,7 @@ return 0; } -static struct pci_device_id snd_intel8x0_joystick_ids[] __devinitdata = { +static struct pci_device_id snd_intel8x0_joystick_ids[] = { { 0x8086, 0x2410, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 }, /* 82801AA */ { 0x8086, 0x2420, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 }, /* 82901AB */ { 0x8086, 0x2440, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 }, /* ICH2 */ diff -Nru a/sound/pci/korg1212/korg1212.c b/sound/pci/korg1212/korg1212.c --- a/sound/pci/korg1212/korg1212.c Fri Aug 1 12:19:18 2003 +++ b/sound/pci/korg1212/korg1212.c Fri Aug 1 12:19:18 2003 @@ -423,7 +423,7 @@ MODULE_PARM_SYNTAX(enable, SNDRV_ENABLE_DESC); MODULE_AUTHOR("Haroldo Gamal <gamal@alternex.com.br>"); -static struct pci_device_id snd_korg1212_ids[] __devinitdata = { +static struct pci_device_id snd_korg1212_ids[] = { { .vendor = 0x10b5, .device = 0x906d, diff -Nru a/sound/pci/maestro3.c b/sound/pci/maestro3.c --- a/sound/pci/maestro3.c Fri Aug 1 12:19:19 2003 +++ b/sound/pci/maestro3.c Fri Aug 1 12:19:19 2003 @@ -894,7 +894,7 @@ #define PCI_DEVICE_ID_ESS_MAESTRO3_2 0x199b #endif -static struct pci_device_id snd_m3_ids[] __devinitdata = { +static struct pci_device_id snd_m3_ids[] = { {PCI_VENDOR_ID_ESS, PCI_DEVICE_ID_ESS_ALLEGRO_1, PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_MULTIMEDIA_AUDIO << 8, 0xffff00, 0}, {PCI_VENDOR_ID_ESS, PCI_DEVICE_ID_ESS_ALLEGRO, PCI_ANY_ID, PCI_ANY_ID, diff -Nru a/sound/pci/nm256/nm256.c b/sound/pci/nm256/nm256.c --- a/sound/pci/nm256/nm256.c Fri Aug 1 12:19:19 2003 +++ b/sound/pci/nm256/nm256.c Fri Aug 1 12:19:19 2003 @@ -276,7 +276,7 @@ #endif -static struct pci_device_id snd_nm256_ids[] __devinitdata = { +static struct pci_device_id snd_nm256_ids[] = { {PCI_VENDOR_ID_NEOMAGIC, PCI_DEVICE_ID_NEOMAGIC_NM256AV_AUDIO, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, {PCI_VENDOR_ID_NEOMAGIC, PCI_DEVICE_ID_NEOMAGIC_NM256ZX_AUDIO, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, {0,}, diff -Nru a/sound/pci/rme32.c b/sound/pci/rme32.c --- a/sound/pci/rme32.c Fri Aug 1 12:19:19 2003 +++ b/sound/pci/rme32.c Fri Aug 1 12:19:19 2003 @@ -223,7 +223,7 @@ snd_kcontrol_t *spdif_ctl; } rme32_t; -static struct pci_device_id snd_rme32_ids[] __devinitdata = { +static struct pci_device_id snd_rme32_ids[] = { {PCI_VENDOR_ID_XILINX_RME, PCI_DEVICE_ID_DIGI32, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0,}, {PCI_VENDOR_ID_XILINX_RME, PCI_DEVICE_ID_DIGI32_8, diff -Nru a/sound/pci/rme96.c b/sound/pci/rme96.c --- a/sound/pci/rme96.c Fri Aug 1 12:19:19 2003 +++ b/sound/pci/rme96.c Fri Aug 1 12:19:19 2003 @@ -260,7 +260,7 @@ snd_kcontrol_t *spdif_ctl; } rme96_t; -static struct pci_device_id snd_rme96_ids[] __devinitdata = { +static struct pci_device_id snd_rme96_ids[] = { { PCI_VENDOR_ID_XILINX, PCI_DEVICE_ID_DIGI96, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0, }, { PCI_VENDOR_ID_XILINX, PCI_DEVICE_ID_DIGI96_8, diff -Nru a/sound/pci/rme9652/hdsp.c b/sound/pci/rme9652/hdsp.c --- a/sound/pci/rme9652/hdsp.c Fri Aug 1 12:19:19 2003 +++ b/sound/pci/rme9652/hdsp.c Fri Aug 1 12:19:19 2003 @@ -437,7 +437,7 @@ extern void snd_hammerfall_free_buffer(struct pci_dev *, void *ptr); #endif -static struct pci_device_id snd_hdsp_ids[] __devinitdata = { +static struct pci_device_id snd_hdsp_ids[] = { { .vendor = PCI_VENDOR_ID_XILINX, .device = PCI_DEVICE_ID_XILINX_HAMMERFALL_DSP, diff -Nru a/sound/pci/rme9652/rme9652.c b/sound/pci/rme9652/rme9652.c --- a/sound/pci/rme9652/rme9652.c Fri Aug 1 12:19:19 2003 +++ b/sound/pci/rme9652/rme9652.c Fri Aug 1 12:19:19 2003 @@ -313,7 +313,7 @@ extern void snd_hammerfall_free_buffer(struct pci_dev *, void *ptr); #endif -static struct pci_device_id snd_rme9652_ids[] __devinitdata = { +static struct pci_device_id snd_rme9652_ids[] = { { .vendor = 0x10ee, .device = 0x3fc4, diff -Nru a/sound/pci/sonicvibes.c b/sound/pci/sonicvibes.c --- a/sound/pci/sonicvibes.c Fri Aug 1 12:19:19 2003 +++ b/sound/pci/sonicvibes.c Fri Aug 1 12:19:19 2003 @@ -259,7 +259,7 @@ #endif }; -static struct pci_device_id snd_sonic_ids[] __devinitdata = { +static struct pci_device_id snd_sonic_ids[] = { { 0x5333, 0xca00, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0, }, { 0, } }; diff -Nru a/sound/pci/trident/trident.c b/sound/pci/trident/trident.c --- a/sound/pci/trident/trident.c Fri Aug 1 12:19:18 2003 +++ b/sound/pci/trident/trident.c Fri Aug 1 12:19:18 2003 @@ -69,7 +69,7 @@ MODULE_PARM_DESC(wavetable_size, "Maximum memory size in kB for wavetable synth."); MODULE_PARM_SYNTAX(wavetable_size, SNDRV_ENABLED ",default:8192,skill:advanced"); -static struct pci_device_id snd_trident_ids[] __devinitdata = { +static struct pci_device_id snd_trident_ids[] = { { 0x1023, 0x2000, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0, }, /* Trident 4DWave DX PCI Audio */ { 0x1023, 0x2001, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0, }, /* Trident 4DWave NX PCI Audio */ { 0x1039, 0x7018, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0, }, /* SiS SI7018 PCI Audio */ diff -Nru a/sound/pci/via82xx.c b/sound/pci/via82xx.c --- a/sound/pci/via82xx.c Fri Aug 1 12:19:19 2003 +++ b/sound/pci/via82xx.c Fri Aug 1 12:19:19 2003 @@ -452,7 +452,7 @@ snd_info_entry_t *proc_entry; }; -static struct pci_device_id snd_via82xx_ids[] __devinitdata = { +static struct pci_device_id snd_via82xx_ids[] = { { 0x1106, 0x3058, PCI_ANY_ID, PCI_ANY_ID, 0, 0, TYPE_CARD_VIA686, }, /* 686A */ { 0x1106, 0x3059, PCI_ANY_ID, PCI_ANY_ID, 0, 0, TYPE_CARD_VIA8233, }, /* VT8233 */ { 0, } diff -Nru a/sound/pci/vx222/vx222.c b/sound/pci/vx222/vx222.c --- a/sound/pci/vx222/vx222.c Fri Aug 1 12:19:19 2003 +++ b/sound/pci/vx222/vx222.c Fri Aug 1 12:19:19 2003 @@ -68,7 +68,7 @@ VX_PCI_VX222_NEW }; -static struct pci_device_id snd_vx222_ids[] __devinitdata = { +static struct pci_device_id snd_vx222_ids[] = { { 0x10b5, 0x9050, PCI_ANY_ID, PCI_ANY_ID, 0, 0, VX_PCI_VX222_OLD, }, /* PLX */ { 0x10b5, 0x9030, PCI_ANY_ID, PCI_ANY_ID, 0, 0, VX_PCI_VX222_NEW, }, /* PLX */ { 0, } diff -Nru a/sound/pci/ymfpci/ymfpci.c b/sound/pci/ymfpci/ymfpci.c --- a/sound/pci/ymfpci/ymfpci.c Fri Aug 1 12:19:19 2003 +++ b/sound/pci/ymfpci/ymfpci.c Fri Aug 1 12:19:19 2003 @@ -67,7 +67,7 @@ MODULE_PARM_DESC(rear_switch, "Enable shared rear/line-in switch"); MODULE_PARM_SYNTAX(rear_switch, SNDRV_ENABLED "," SNDRV_BOOLEAN_FALSE_DESC); -static struct pci_device_id snd_ymfpci_ids[] __devinitdata = { +static struct pci_device_id snd_ymfpci_ids[] = { { 0x1073, 0x0004, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0, }, /* YMF724 */ { 0x1073, 0x000d, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0, }, /* YMF724F */ { 0x1073, 0x000a, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0, }, /* YMF740 */ ^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH] PCI fixes for 2.6.0-test2 2003-08-01 19:31 ` [PATCH] " Greg KH @ 2003-08-01 19:31 ` Greg KH 2003-08-01 19:31 ` Greg KH 0 siblings, 1 reply; 9+ messages in thread From: Greg KH @ 2003-08-01 19:31 UTC (permalink / raw) To: linux-kernel ChangeSet 1.1547.10.2, 2003/07/31 16:07:20-07:00, greg@kroah.com [PATCH] PCI: pci_device_id can not be marked __devinitdata. Fixes up drivers/atm/* drivers/block/* drivers/char/* and drivers/video/* drivers/atm/eni.c | 2 +- drivers/atm/firestream.c | 3 ++- drivers/atm/he.c | 2 +- drivers/atm/idt77252.c | 2 +- drivers/atm/iphase.c | 2 +- drivers/block/umem.c | 2 +- drivers/char/agp/ali-agp.c | 2 +- drivers/char/agp/amd-k7-agp.c | 2 +- drivers/char/agp/amd-k8-agp.c | 2 +- drivers/char/agp/i460-agp.c | 2 +- drivers/char/agp/intel-agp.c | 2 +- drivers/char/agp/nvidia-agp.c | 2 +- drivers/char/agp/sworks-agp.c | 2 +- drivers/char/epca.c | 2 +- drivers/char/synclink.c | 2 +- drivers/char/synclinkmp.c | 2 +- drivers/char/watchdog/wdt_pci.c | 2 +- drivers/video/aty/aty128fb.c | 2 +- drivers/video/chipsfb.c | 2 +- drivers/video/console/sticore.c | 2 +- drivers/video/cyber2000fb.c | 2 +- drivers/video/i810/i810_main.h | 2 +- drivers/video/imsttfb.c | 2 +- drivers/video/matrox/matroxfb_base.c | 2 +- drivers/video/neofb.c | 2 +- drivers/video/radeonfb.c | 2 +- drivers/video/riva/fbdev.c | 2 +- drivers/video/sstfb.c | 2 +- drivers/video/tdfxfb.c | 2 +- drivers/video/tridentfb.c | 2 +- 30 files changed, 31 insertions(+), 30 deletions(-) diff -Nru a/drivers/atm/eni.c b/drivers/atm/eni.c --- a/drivers/atm/eni.c Fri Aug 1 12:19:02 2003 +++ b/drivers/atm/eni.c Fri Aug 1 12:19:02 2003 @@ -2327,7 +2327,7 @@ } -static struct pci_device_id eni_pci_tbl[] __devinitdata = { +static struct pci_device_id eni_pci_tbl[] = { { PCI_VENDOR_ID_EF, PCI_DEVICE_ID_EF_ATM_FPGA, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 /* FPGA */ }, { PCI_VENDOR_ID_EF, PCI_DEVICE_ID_EF_ATM_ASIC, PCI_ANY_ID, PCI_ANY_ID, diff -Nru a/drivers/atm/firestream.c b/drivers/atm/firestream.c --- a/drivers/atm/firestream.c Fri Aug 1 12:19:02 2003 +++ b/drivers/atm/firestream.c Fri Aug 1 12:19:02 2003 @@ -2091,7 +2091,7 @@ #endif */ -static struct pci_device_id firestream_pci_tbl[] __devinitdata = { +static struct pci_device_id firestream_pci_tbl[] = { { PCI_VENDOR_ID_FUJITSU_ME, PCI_DEVICE_ID_FUJITSU_FS50, PCI_ANY_ID, PCI_ANY_ID, 0, 0, FS_IS50}, { PCI_VENDOR_ID_FUJITSU_ME, PCI_DEVICE_ID_FUJITSU_FS155, @@ -2127,4 +2127,5 @@ module_exit(firestream_cleanup_module); MODULE_LICENSE("GPL"); + diff -Nru a/drivers/atm/he.c b/drivers/atm/he.c --- a/drivers/atm/he.c Fri Aug 1 12:19:02 2003 +++ b/drivers/atm/he.c Fri Aug 1 12:19:02 2003 @@ -3096,7 +3096,7 @@ MODULE_PARM(sdh, "i"); MODULE_PARM_DESC(sdh, "use SDH framing (default 0)"); -static struct pci_device_id he_pci_tbl[] __devinitdata = { +static struct pci_device_id he_pci_tbl[] = { { PCI_VENDOR_ID_FORE, PCI_DEVICE_ID_FORE_HE, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 }, { 0, } diff -Nru a/drivers/atm/idt77252.c b/drivers/atm/idt77252.c --- a/drivers/atm/idt77252.c Fri Aug 1 12:19:02 2003 +++ b/drivers/atm/idt77252.c Fri Aug 1 12:19:02 2003 @@ -3841,7 +3841,7 @@ return 0; } -static struct pci_device_id idt77252_pci_tbl[] __devinitdata = +static struct pci_device_id idt77252_pci_tbl[] = { { PCI_VENDOR_ID_IDT, PCI_DEVICE_ID_IDT_IDT77252, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 }, diff -Nru a/drivers/atm/iphase.c b/drivers/atm/iphase.c --- a/drivers/atm/iphase.c Fri Aug 1 12:19:02 2003 +++ b/drivers/atm/iphase.c Fri Aug 1 12:19:02 2003 @@ -3279,7 +3279,7 @@ kfree(iadev); } -static struct pci_device_id ia_pci_tbl[] __devinitdata = { +static struct pci_device_id ia_pci_tbl[] = { { PCI_VENDOR_ID_IPHASE, 0x0008, PCI_ANY_ID, PCI_ANY_ID, }, { PCI_VENDOR_ID_IPHASE, 0x0009, PCI_ANY_ID, PCI_ANY_ID, }, { 0,} diff -Nru a/drivers/block/umem.c b/drivers/block/umem.c --- a/drivers/block/umem.c Fri Aug 1 12:19:02 2003 +++ b/drivers/block/umem.c Fri Aug 1 12:19:02 2003 @@ -1145,7 +1145,7 @@ card->mm_pages[1].page_dma); } -static const struct pci_device_id __devinitdata mm_pci_ids[] = { { +static const struct pci_device_id mm_pci_ids[] = { { .vendor = PCI_VENDOR_ID_MICRO_MEMORY, .device = PCI_DEVICE_ID_MICRO_MEMORY_5415CN, }, { diff -Nru a/drivers/char/agp/ali-agp.c b/drivers/char/agp/ali-agp.c --- a/drivers/char/agp/ali-agp.c Fri Aug 1 12:19:02 2003 +++ b/drivers/char/agp/ali-agp.c Fri Aug 1 12:19:02 2003 @@ -363,7 +363,7 @@ agp_put_bridge(bridge); } -static struct pci_device_id agp_ali_pci_table[] __initdata = { +static struct pci_device_id agp_ali_pci_table[] = { { .class = (PCI_CLASS_BRIDGE_HOST << 8), .class_mask = ~0, diff -Nru a/drivers/char/agp/amd-k7-agp.c b/drivers/char/agp/amd-k7-agp.c --- a/drivers/char/agp/amd-k7-agp.c Fri Aug 1 12:19:02 2003 +++ b/drivers/char/agp/amd-k7-agp.c Fri Aug 1 12:19:02 2003 @@ -442,7 +442,7 @@ agp_put_bridge(bridge); } -static struct pci_device_id agp_amdk7_pci_table[] __initdata = { +static struct pci_device_id agp_amdk7_pci_table[] = { { .class = (PCI_CLASS_BRIDGE_HOST << 8), .class_mask = ~0, diff -Nru a/drivers/char/agp/amd-k8-agp.c b/drivers/char/agp/amd-k8-agp.c --- a/drivers/char/agp/amd-k8-agp.c Fri Aug 1 12:19:02 2003 +++ b/drivers/char/agp/amd-k8-agp.c Fri Aug 1 12:19:02 2003 @@ -349,7 +349,7 @@ agp_put_bridge(bridge); } -static struct pci_device_id agp_amdk8_pci_table[] __initdata = { +static struct pci_device_id agp_amdk8_pci_table[] = { { .class = (PCI_CLASS_BRIDGE_HOST << 8), .class_mask = ~0, diff -Nru a/drivers/char/agp/i460-agp.c b/drivers/char/agp/i460-agp.c --- a/drivers/char/agp/i460-agp.c Fri Aug 1 12:19:02 2003 +++ b/drivers/char/agp/i460-agp.c Fri Aug 1 12:19:02 2003 @@ -590,7 +590,7 @@ agp_put_bridge(bridge); } -static struct pci_device_id agp_intel_i460_pci_table[] __initdata = { +static struct pci_device_id agp_intel_i460_pci_table[] = { { .class = (PCI_CLASS_BRIDGE_HOST << 8), .class_mask = ~0, diff -Nru a/drivers/char/agp/intel-agp.c b/drivers/char/agp/intel-agp.c --- a/drivers/char/agp/intel-agp.c Fri Aug 1 12:19:02 2003 +++ b/drivers/char/agp/intel-agp.c Fri Aug 1 12:19:02 2003 @@ -1417,7 +1417,7 @@ return 0; } -static struct pci_device_id agp_intel_pci_table[] __initdata = { +static struct pci_device_id agp_intel_pci_table[] = { { .class = (PCI_CLASS_BRIDGE_HOST << 8), .class_mask = ~0, diff -Nru a/drivers/char/agp/nvidia-agp.c b/drivers/char/agp/nvidia-agp.c --- a/drivers/char/agp/nvidia-agp.c Fri Aug 1 12:19:02 2003 +++ b/drivers/char/agp/nvidia-agp.c Fri Aug 1 12:19:02 2003 @@ -338,7 +338,7 @@ agp_put_bridge(bridge); } -static struct pci_device_id agp_nvidia_pci_table[] __initdata = { +static struct pci_device_id agp_nvidia_pci_table[] = { { .class = (PCI_CLASS_BRIDGE_HOST << 8), .class_mask = ~0, diff -Nru a/drivers/char/agp/sworks-agp.c b/drivers/char/agp/sworks-agp.c --- a/drivers/char/agp/sworks-agp.c Fri Aug 1 12:19:02 2003 +++ b/drivers/char/agp/sworks-agp.c Fri Aug 1 12:19:02 2003 @@ -508,7 +508,7 @@ agp_put_bridge(bridge); } -static struct pci_device_id agp_serverworks_pci_table[] __initdata = { +static struct pci_device_id agp_serverworks_pci_table[] = { { .class = (PCI_CLASS_BRIDGE_HOST << 8), .class_mask = ~0, diff -Nru a/drivers/char/epca.c b/drivers/char/epca.c --- a/drivers/char/epca.c Fri Aug 1 12:19:02 2003 +++ b/drivers/char/epca.c Fri Aug 1 12:19:02 2003 @@ -3945,7 +3945,7 @@ } -static struct pci_device_id epca_pci_tbl[] __initdata = { +static struct pci_device_id epca_pci_tbl[] = { { PCI_VENDOR_DIGI, PCI_DEVICE_XR, PCI_ANY_ID, PCI_ANY_ID, 0, 0, brd_xr }, { PCI_VENDOR_DIGI, PCI_DEVICE_XEM, PCI_ANY_ID, PCI_ANY_ID, 0, 0, brd_xem }, { PCI_VENDOR_DIGI, PCI_DEVICE_CX, PCI_ANY_ID, PCI_ANY_ID, 0, 0, brd_cx }, diff -Nru a/drivers/char/synclink.c b/drivers/char/synclink.c --- a/drivers/char/synclink.c Fri Aug 1 12:19:02 2003 +++ b/drivers/char/synclink.c Fri Aug 1 12:19:02 2003 @@ -916,7 +916,7 @@ const struct pci_device_id *ent); static void synclink_remove_one (struct pci_dev *dev); -static struct pci_device_id synclink_pci_tbl[] __devinitdata = { +static struct pci_device_id synclink_pci_tbl[] = { { PCI_VENDOR_ID_MICROGATE, PCI_DEVICE_ID_MICROGATE_USC, PCI_ANY_ID, PCI_ANY_ID, }, { PCI_VENDOR_ID_MICROGATE, 0x0210, PCI_ANY_ID, PCI_ANY_ID, }, { 0, }, /* terminate list */ diff -Nru a/drivers/char/synclinkmp.c b/drivers/char/synclinkmp.c --- a/drivers/char/synclinkmp.c Fri Aug 1 12:19:02 2003 +++ b/drivers/char/synclinkmp.c Fri Aug 1 12:19:02 2003 @@ -501,7 +501,7 @@ static int synclinkmp_init_one(struct pci_dev *dev,const struct pci_device_id *ent); static void synclinkmp_remove_one(struct pci_dev *dev); -static struct pci_device_id synclinkmp_pci_tbl[] __devinitdata = { +static struct pci_device_id synclinkmp_pci_tbl[] = { { PCI_VENDOR_ID_MICROGATE, PCI_DEVICE_ID_MICROGATE_SCA, PCI_ANY_ID, PCI_ANY_ID, }, { 0, }, /* terminate list */ }; diff -Nru a/drivers/char/watchdog/wdt_pci.c b/drivers/char/watchdog/wdt_pci.c --- a/drivers/char/watchdog/wdt_pci.c Fri Aug 1 12:19:02 2003 +++ b/drivers/char/watchdog/wdt_pci.c Fri Aug 1 12:19:02 2003 @@ -590,7 +590,7 @@ } -static struct pci_device_id wdtpci_pci_tbl[] __initdata = { +static struct pci_device_id wdtpci_pci_tbl[] = { { .vendor = PCI_VENDOR_ID_ACCESSIO, .device = PCI_DEVICE_ID_WDG_CSM, diff -Nru a/drivers/video/aty/aty128fb.c b/drivers/video/aty/aty128fb.c --- a/drivers/video/aty/aty128fb.c Fri Aug 1 12:19:02 2003 +++ b/drivers/video/aty/aty128fb.c Fri Aug 1 12:19:02 2003 @@ -148,7 +148,7 @@ static void aty128_remove(struct pci_dev *pdev); /* supported Rage128 chipsets */ -static struct pci_device_id aty128_pci_tbl[] __devinitdata = { +static struct pci_device_id aty128_pci_tbl[] = { { PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_RAGE128_RE, PCI_ANY_ID, PCI_ANY_ID, 0, 0, rage_128 }, { PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_RAGE128_RF, diff -Nru a/drivers/video/chipsfb.c b/drivers/video/chipsfb.c --- a/drivers/video/chipsfb.c Fri Aug 1 12:19:02 2003 +++ b/drivers/video/chipsfb.c Fri Aug 1 12:19:02 2003 @@ -446,7 +446,7 @@ #endif /* CONFIG_PMAC_PBOOK */ } -static struct pci_device_id chipsfb_pci_tbl[] __devinitdata = { +static struct pci_device_id chipsfb_pci_tbl[] = { { PCI_VENDOR_ID_CT, PCI_DEVICE_ID_CT_65550, PCI_ANY_ID, PCI_ANY_ID }, { 0 } }; diff -Nru a/drivers/video/console/sticore.c b/drivers/video/console/sticore.c --- a/drivers/video/console/sticore.c Fri Aug 1 12:19:02 2003 +++ b/drivers/video/console/sticore.c Fri Aug 1 12:19:02 2003 @@ -1003,7 +1003,7 @@ } -static struct pci_device_id sti_pci_tbl[] __devinitdata = { +static struct pci_device_id sti_pci_tbl[] = { { PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_VISUALIZE_EG, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 }, { PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_VISUALIZE_FX6, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 }, { PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_VISUALIZE_FX4, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 }, diff -Nru a/drivers/video/cyber2000fb.c b/drivers/video/cyber2000fb.c --- a/drivers/video/cyber2000fb.c Fri Aug 1 12:19:02 2003 +++ b/drivers/video/cyber2000fb.c Fri Aug 1 12:19:02 2003 @@ -1683,7 +1683,7 @@ return 0; } -static struct pci_device_id cyberpro_pci_table[] __devinitdata = { +static struct pci_device_id cyberpro_pci_table[] = { // Not yet // { PCI_VENDOR_ID_INTERG, PCI_DEVICE_ID_INTERG_1682, // PCI_ANY_ID, PCI_ANY_ID, 0, 0, ID_IGA_1682 }, diff -Nru a/drivers/video/i810/i810_main.h b/drivers/video/i810/i810_main.h --- a/drivers/video/i810/i810_main.h Fri Aug 1 12:19:02 2003 +++ b/drivers/video/i810/i810_main.h Fri Aug 1 12:19:02 2003 @@ -24,7 +24,7 @@ "Intel(R) 815 (Internal Graphics with AGP) Framebuffer Device" }; -static struct pci_device_id i810fb_pci_tbl[] __initdata = { +static struct pci_device_id i810fb_pci_tbl[] = { { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82810_IG1, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 }, { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82810_IG3, diff -Nru a/drivers/video/imsttfb.c b/drivers/video/imsttfb.c --- a/drivers/video/imsttfb.c Fri Aug 1 12:19:02 2003 +++ b/drivers/video/imsttfb.c Fri Aug 1 12:19:02 2003 @@ -1316,7 +1316,7 @@ } } -static struct pci_device_id imsttfb_pci_tbl[] __devinitdata = { +static struct pci_device_id imsttfb_pci_tbl[] = { { PCI_VENDOR_ID_IMS, PCI_DEVICE_ID_IMS_TT128, PCI_ANY_ID, PCI_ANY_ID, 0, 0, IBM }, { PCI_VENDOR_ID_IMS, PCI_DEVICE_ID_IMS_TT3D, diff -Nru a/drivers/video/matrox/matroxfb_base.c b/drivers/video/matrox/matroxfb_base.c --- a/drivers/video/matrox/matroxfb_base.c Fri Aug 1 12:19:02 2003 +++ b/drivers/video/matrox/matroxfb_base.c Fri Aug 1 12:19:02 2003 @@ -2012,7 +2012,7 @@ matroxfb_remove(PMINFO 1); } -static struct pci_device_id matroxfb_devices[] __devinitdata = { +static struct pci_device_id matroxfb_devices[] = { #ifdef CONFIG_FB_MATROX_MILLENIUM {PCI_VENDOR_ID_MATROX, PCI_DEVICE_ID_MATROX_MIL, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, diff -Nru a/drivers/video/neofb.c b/drivers/video/neofb.c --- a/drivers/video/neofb.c Fri Aug 1 12:19:02 2003 +++ b/drivers/video/neofb.c Fri Aug 1 12:19:02 2003 @@ -2065,7 +2065,7 @@ } } -static struct pci_device_id neofb_devices[] __devinitdata = { +static struct pci_device_id neofb_devices[] = { {PCI_VENDOR_ID_NEOMAGIC, PCI_CHIP_NM2070, PCI_ANY_ID, PCI_ANY_ID, 0, 0, FB_ACCEL_NEOMAGIC_NM2070}, diff -Nru a/drivers/video/radeonfb.c b/drivers/video/radeonfb.c --- a/drivers/video/radeonfb.c Fri Aug 1 12:19:02 2003 +++ b/drivers/video/radeonfb.c Fri Aug 1 12:19:02 2003 @@ -185,7 +185,7 @@ }; -static struct pci_device_id radeonfb_pci_table[] __devinitdata = { +static struct pci_device_id radeonfb_pci_table[] = { { PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_RADEON_QD, PCI_ANY_ID, PCI_ANY_ID, 0, 0, RADEON_QD}, { PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_RADEON_QE, PCI_ANY_ID, PCI_ANY_ID, 0, 0, RADEON_QE}, { PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_RADEON_QF, PCI_ANY_ID, PCI_ANY_ID, 0, 0, RADEON_QF}, diff -Nru a/drivers/video/riva/fbdev.c b/drivers/video/riva/fbdev.c --- a/drivers/video/riva/fbdev.c Fri Aug 1 12:19:02 2003 +++ b/drivers/video/riva/fbdev.c Fri Aug 1 12:19:02 2003 @@ -193,7 +193,7 @@ { "Quadro4-700-XGL", NV_ARCH_20 } }; -static struct pci_device_id rivafb_pci_tbl[] __initdata = { +static struct pci_device_id rivafb_pci_tbl[] = { { PCI_VENDOR_ID_NVIDIA_SGS, PCI_DEVICE_ID_NVIDIA_SGS_RIVA128, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CH_RIVA_128 }, { PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_TNT, diff -Nru a/drivers/video/sstfb.c b/drivers/video/sstfb.c --- a/drivers/video/sstfb.c Fri Aug 1 12:19:02 2003 +++ b/drivers/video/sstfb.c Fri Aug 1 12:19:02 2003 @@ -1554,7 +1554,7 @@ } -static struct pci_device_id sstfb_id_tbl[] __devinitdata = { +static struct pci_device_id sstfb_id_tbl[] = { { PCI_VENDOR_ID_3DFX, PCI_DEVICE_ID_3DFX_VOODOO, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ID_VOODOO1 }, { PCI_VENDOR_ID_3DFX, PCI_DEVICE_ID_3DFX_VOODOO2, diff -Nru a/drivers/video/tdfxfb.c b/drivers/video/tdfxfb.c --- a/drivers/video/tdfxfb.c Fri Aug 1 12:19:02 2003 +++ b/drivers/video/tdfxfb.c Fri Aug 1 12:19:02 2003 @@ -128,7 +128,7 @@ static int tdfxfb_probe(struct pci_dev *pdev, const struct pci_device_id *id); static void tdfxfb_remove(struct pci_dev *pdev); -static struct pci_device_id tdfxfb_id_table[] __devinitdata = { +static struct pci_device_id tdfxfb_id_table[] = { { PCI_VENDOR_ID_3DFX, PCI_DEVICE_ID_3DFX_BANSHEE, PCI_ANY_ID, PCI_ANY_ID, PCI_BASE_CLASS_DISPLAY << 16, 0xff0000, 0 }, diff -Nru a/drivers/video/tridentfb.c b/drivers/video/tridentfb.c --- a/drivers/video/tridentfb.c Fri Aug 1 12:19:02 2003 +++ b/drivers/video/tridentfb.c Fri Aug 1 12:19:02 2003 @@ -1176,7 +1176,7 @@ } /* List of boards that we are trying to support */ -static struct pci_device_id trident_devices[] __devinitdata = { +static struct pci_device_id trident_devices[] = { {PCI_VENDOR_ID_TRIDENT, BLADE3D, PCI_ANY_ID,PCI_ANY_ID,0,0,0}, {PCI_VENDOR_ID_TRIDENT, CYBERBLADEi7, PCI_ANY_ID,PCI_ANY_ID,0,0,0}, {PCI_VENDOR_ID_TRIDENT, CYBERBLADEi7D, PCI_ANY_ID,PCI_ANY_ID,0,0,0}, ^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH] PCI fixes for 2.6.0-test2 2003-08-01 19:31 ` Greg KH @ 2003-08-01 19:31 ` Greg KH 2003-08-01 19:31 ` Greg KH 0 siblings, 1 reply; 9+ messages in thread From: Greg KH @ 2003-08-01 19:31 UTC (permalink / raw) To: linux-kernel ChangeSet 1.1547.10.3, 2003/07/31 16:07:35-07:00, greg@kroah.com [PATCH] PCI: pci_device_id can not be marked __devinitdata. Fixes up drivers/net/* drivers/net/3c59x.c | 2 +- drivers/net/8139cp.c | 2 +- drivers/net/8139too.c | 2 +- drivers/net/acenic.c | 2 +- drivers/net/amd8111e.c | 2 +- drivers/net/arcnet/com20020-pci.c | 2 +- drivers/net/b44.c | 2 +- drivers/net/defxx.c | 2 +- drivers/net/dl2k.h | 2 +- drivers/net/e100/e100_main.c | 2 +- drivers/net/e1000/e1000_main.c | 2 +- drivers/net/eepro100.c | 2 +- drivers/net/epic100.c | 2 +- drivers/net/fealnx.c | 2 +- drivers/net/hamachi.c | 2 +- drivers/net/ioc3-eth.c | 2 +- drivers/net/irda/donauboe.c | 2 +- drivers/net/irda/toshoboe.c | 2 +- drivers/net/irda/vlsi_ir.c | 2 +- drivers/net/ixgb/ixgb_main.c | 2 +- drivers/net/natsemi.c | 2 +- drivers/net/ne2k-pci.c | 2 +- drivers/net/ns83820.c | 2 +- drivers/net/pci-skeleton.c | 2 +- drivers/net/pcnet32.c | 2 +- drivers/net/r8169.c | 2 +- drivers/net/rcpci45.c | 2 +- drivers/net/rrunner.c | 2 +- drivers/net/sis900.c | 2 +- drivers/net/sk98lin/skge.c | 2 +- drivers/net/starfire.c | 2 +- drivers/net/sundance.c | 2 +- drivers/net/sungem.c | 2 +- drivers/net/sunhme.c | 2 +- drivers/net/tc35815.c | 2 +- drivers/net/tg3.c | 2 +- drivers/net/tlan.c | 2 +- drivers/net/tokenring/3c359.c | 2 +- drivers/net/tokenring/abyss.c | 2 +- drivers/net/tokenring/lanstreamer.c | 2 +- drivers/net/tokenring/olympic.c | 2 +- drivers/net/tokenring/tmspci.c | 2 +- drivers/net/tulip/de2104x.c | 2 +- drivers/net/tulip/dmfe.c | 2 +- drivers/net/tulip/tulip_core.c | 2 +- drivers/net/tulip/winbond-840.c | 2 +- drivers/net/tulip/xircom_cb.c | 2 +- drivers/net/tulip/xircom_tulip_cb.c | 2 +- drivers/net/typhoon.c | 2 +- drivers/net/via-rhine.c | 2 +- drivers/net/wan/dscc4.c | 2 +- drivers/net/wan/farsync.c | 2 +- drivers/net/wan/lmc/lmc_main.c | 2 +- drivers/net/wan/pc300_drv.c | 2 +- drivers/net/wireless/airo.c | 2 +- drivers/net/wireless/orinoco_pci.c | 2 +- drivers/net/wireless/orinoco_plx.c | 2 +- drivers/net/wireless/orinoco_tmd.c | 2 +- drivers/net/yellowfin.c | 2 +- 59 files changed, 59 insertions(+), 59 deletions(-) diff -Nru a/drivers/net/3c59x.c b/drivers/net/3c59x.c --- a/drivers/net/3c59x.c Fri Aug 1 12:18:47 2003 +++ b/drivers/net/3c59x.c Fri Aug 1 12:18:47 2003 @@ -577,7 +577,7 @@ }; -static struct pci_device_id vortex_pci_tbl[] __devinitdata = { +static struct pci_device_id vortex_pci_tbl[] = { { 0x10B7, 0x5900, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CH_3C590 }, { 0x10B7, 0x5920, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CH_3C592 }, { 0x10B7, 0x5970, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CH_3C597 }, diff -Nru a/drivers/net/8139cp.c b/drivers/net/8139cp.c --- a/drivers/net/8139cp.c Fri Aug 1 12:18:48 2003 +++ b/drivers/net/8139cp.c Fri Aug 1 12:18:48 2003 @@ -415,7 +415,7 @@ { "RTL-8169" }, }; -static struct pci_device_id cp_pci_tbl[] __devinitdata = { +static struct pci_device_id cp_pci_tbl[] = { { PCI_VENDOR_ID_REALTEK, PCI_DEVICE_ID_REALTEK_8139, PCI_ANY_ID, PCI_ANY_ID, 0, 0, RTL8139Cp }, #if 0 diff -Nru a/drivers/net/8139too.c b/drivers/net/8139too.c --- a/drivers/net/8139too.c Fri Aug 1 12:18:47 2003 +++ b/drivers/net/8139too.c Fri Aug 1 12:18:47 2003 @@ -248,7 +248,7 @@ }; -static struct pci_device_id rtl8139_pci_tbl[] __devinitdata = { +static struct pci_device_id rtl8139_pci_tbl[] = { {0x10ec, 0x8139, PCI_ANY_ID, PCI_ANY_ID, 0, 0, RTL8139 }, {0x10ec, 0x8138, PCI_ANY_ID, PCI_ANY_ID, 0, 0, RTL8139_CB }, {0x1113, 0x1211, PCI_ANY_ID, PCI_ANY_ID, 0, 0, SMC1211TX }, diff -Nru a/drivers/net/acenic.c b/drivers/net/acenic.c --- a/drivers/net/acenic.c Fri Aug 1 12:18:48 2003 +++ b/drivers/net/acenic.c Fri Aug 1 12:18:48 2003 @@ -132,7 +132,7 @@ #endif #if LINUX_VERSION_CODE >= 0x20400 -static struct pci_device_id acenic_pci_tbl[] __initdata = { +static struct pci_device_id acenic_pci_tbl[] = { { PCI_VENDOR_ID_ALTEON, PCI_DEVICE_ID_ALTEON_ACENIC_FIBRE, PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_NETWORK_ETHERNET << 8, 0xffff00, }, { PCI_VENDOR_ID_ALTEON, PCI_DEVICE_ID_ALTEON_ACENIC_COPPER, diff -Nru a/drivers/net/amd8111e.c b/drivers/net/amd8111e.c --- a/drivers/net/amd8111e.c Fri Aug 1 12:18:48 2003 +++ b/drivers/net/amd8111e.c Fri Aug 1 12:18:48 2003 @@ -102,7 +102,7 @@ MODULE_PARM(dynamic_ipg, "1-" __MODULE_STRING(MAX_UNITS) "i"); MODULE_PARM_DESC(dynamic_ipg, "Enable or Disable dynamic IPG, 1: Enable, 0: Disable"); -static struct pci_device_id amd8111e_pci_tbl[] __devinitdata = { +static struct pci_device_id amd8111e_pci_tbl[] = { { PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD8111E_7462, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0UL }, diff -Nru a/drivers/net/arcnet/com20020-pci.c b/drivers/net/arcnet/com20020-pci.c --- a/drivers/net/arcnet/com20020-pci.c Fri Aug 1 12:18:47 2003 +++ b/drivers/net/arcnet/com20020-pci.c Fri Aug 1 12:18:47 2003 @@ -139,7 +139,7 @@ com20020_remove(pci_get_drvdata(pdev)); } -static struct pci_device_id com20020pci_id_table[] __devinitdata = { +static struct pci_device_id com20020pci_id_table[] = { { 0x1571, 0xa001, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 }, { 0x1571, 0xa002, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 }, { 0x1571, 0xa003, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 }, diff -Nru a/drivers/net/b44.c b/drivers/net/b44.c --- a/drivers/net/b44.c Fri Aug 1 12:18:47 2003 +++ b/drivers/net/b44.c Fri Aug 1 12:18:47 2003 @@ -89,7 +89,7 @@ #define irqreturn_t void #endif -static struct pci_device_id b44_pci_tbl[] __devinitdata = { +static struct pci_device_id b44_pci_tbl[] = { { PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_BCM4401, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0UL }, { } /* terminate list with empty entry */ diff -Nru a/drivers/net/defxx.c b/drivers/net/defxx.c --- a/drivers/net/defxx.c Fri Aug 1 12:18:47 2003 +++ b/drivers/net/defxx.c Fri Aug 1 12:18:47 2003 @@ -3352,7 +3352,7 @@ pci_set_drvdata(pdev, NULL); } -static struct pci_device_id dfx_pci_tbl[] __devinitdata = { +static struct pci_device_id dfx_pci_tbl[] = { { PCI_VENDOR_ID_DEC, PCI_DEVICE_ID_DEC_FDDI, PCI_ANY_ID, PCI_ANY_ID, }, { 0, } }; diff -Nru a/drivers/net/dl2k.h b/drivers/net/dl2k.h --- a/drivers/net/dl2k.h Fri Aug 1 12:18:48 2003 +++ b/drivers/net/dl2k.h Fri Aug 1 12:18:48 2003 @@ -695,7 +695,7 @@ class_mask of the class are honored during the comparison. driver_data Data private to the driver. */ -static struct pci_device_id rio_pci_tbl[] __devinitdata = { +static struct pci_device_id rio_pci_tbl[] = { {0x1186, 0x4000, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, {0,} }; diff -Nru a/drivers/net/e100/e100_main.c b/drivers/net/e100/e100_main.c --- a/drivers/net/e100/e100_main.c Fri Aug 1 12:18:48 2003 +++ b/drivers/net/e100/e100_main.c Fri Aug 1 12:18:48 2003 @@ -759,7 +759,7 @@ --e100nics; } -static struct pci_device_id e100_id_table[] __devinitdata = { +static struct pci_device_id e100_id_table[] = { {0x8086, 0x1229, PCI_ANY_ID, PCI_ANY_ID, 0, 0, }, {0x8086, 0x2449, PCI_ANY_ID, PCI_ANY_ID, 0, 0, }, {0x8086, 0x1059, PCI_ANY_ID, PCI_ANY_ID, 0, 0, }, diff -Nru a/drivers/net/e1000/e1000_main.c b/drivers/net/e1000/e1000_main.c --- a/drivers/net/e1000/e1000_main.c Fri Aug 1 12:18:47 2003 +++ b/drivers/net/e1000/e1000_main.c Fri Aug 1 12:18:47 2003 @@ -61,7 +61,7 @@ * { Vendor ID, Device ID, SubVendor ID, SubDevice ID, * Class, Class Mask, private data (not used) } */ -static struct pci_device_id e1000_pci_tbl[] __devinitdata = { +static struct pci_device_id e1000_pci_tbl[] = { {0x8086, 0x1000, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, {0x8086, 0x1001, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, {0x8086, 0x1004, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, diff -Nru a/drivers/net/eepro100.c b/drivers/net/eepro100.c --- a/drivers/net/eepro100.c Fri Aug 1 12:18:48 2003 +++ b/drivers/net/eepro100.c Fri Aug 1 12:18:48 2003 @@ -2381,7 +2381,7 @@ kfree(dev); } \f -static struct pci_device_id eepro100_pci_tbl[] __devinitdata = { +static struct pci_device_id eepro100_pci_tbl[] = { { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82557, PCI_ANY_ID, PCI_ANY_ID, }, { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82559ER, diff -Nru a/drivers/net/epic100.c b/drivers/net/epic100.c --- a/drivers/net/epic100.c Fri Aug 1 12:18:47 2003 +++ b/drivers/net/epic100.c Fri Aug 1 12:18:48 2003 @@ -242,7 +242,7 @@ }; -static struct pci_device_id epic_pci_tbl[] __devinitdata = { +static struct pci_device_id epic_pci_tbl[] = { { 0x10B8, 0x0005, 0x1092, 0x0AB4, 0, 0, SMSC_83C170_0 }, { 0x10B8, 0x0005, PCI_ANY_ID, PCI_ANY_ID, 0, 0, SMSC_83C170 }, { 0x10B8, 0x0006, PCI_ANY_ID, PCI_ANY_ID, diff -Nru a/drivers/net/fealnx.c b/drivers/net/fealnx.c --- a/drivers/net/fealnx.c Fri Aug 1 12:18:48 2003 +++ b/drivers/net/fealnx.c Fri Aug 1 12:18:48 2003 @@ -1905,7 +1905,7 @@ return 0; } -static struct pci_device_id fealnx_pci_tbl[] __devinitdata = { +static struct pci_device_id fealnx_pci_tbl[] = { {0x1516, 0x0800, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, {0x1516, 0x0803, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 1}, {0x1516, 0x0891, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 2}, diff -Nru a/drivers/net/hamachi.c b/drivers/net/hamachi.c --- a/drivers/net/hamachi.c Fri Aug 1 12:18:48 2003 +++ b/drivers/net/hamachi.c Fri Aug 1 12:18:48 2003 @@ -1982,7 +1982,7 @@ } } -static struct pci_device_id hamachi_pci_tbl[] __initdata = { +static struct pci_device_id hamachi_pci_tbl[] = { { 0x1318, 0x0911, PCI_ANY_ID, PCI_ANY_ID, }, { 0, } }; diff -Nru a/drivers/net/ioc3-eth.c b/drivers/net/ioc3-eth.c --- a/drivers/net/ioc3-eth.c Fri Aug 1 12:18:47 2003 +++ b/drivers/net/ioc3-eth.c Fri Aug 1 12:18:47 2003 @@ -1528,7 +1528,7 @@ kfree(dev); } -static struct pci_device_id ioc3_pci_tbl[] __devinitdata = { +static struct pci_device_id ioc3_pci_tbl[] = { { PCI_VENDOR_ID_SGI, PCI_DEVICE_ID_SGI_IOC3, PCI_ANY_ID, PCI_ANY_ID }, { 0 } }; diff -Nru a/drivers/net/irda/donauboe.c b/drivers/net/irda/donauboe.c --- a/drivers/net/irda/donauboe.c Fri Aug 1 12:18:47 2003 +++ b/drivers/net/irda/donauboe.c Fri Aug 1 12:18:47 2003 @@ -189,7 +189,7 @@ #define CONFIG0H_DMA_ON_NORX CONFIG0H_DMA_OFF| OBOE_CONFIG0H_ENDMAC #define CONFIG0H_DMA_ON CONFIG0H_DMA_ON_NORX | OBOE_CONFIG0H_ENRX -static struct pci_device_id toshoboe_pci_tbl[] __initdata = { +static struct pci_device_id toshoboe_pci_tbl[] = { { PCI_VENDOR_ID_TOSHIBA, PCI_DEVICE_ID_FIR701, PCI_ANY_ID, PCI_ANY_ID, }, { PCI_VENDOR_ID_TOSHIBA, PCI_DEVICE_ID_FIRD01, PCI_ANY_ID, PCI_ANY_ID, }, { } /* Terminating entry */ diff -Nru a/drivers/net/irda/toshoboe.c b/drivers/net/irda/toshoboe.c --- a/drivers/net/irda/toshoboe.c Fri Aug 1 12:18:47 2003 +++ b/drivers/net/irda/toshoboe.c Fri Aug 1 12:18:47 2003 @@ -77,7 +77,7 @@ #define PCI_DEVICE_ID_FIR701b 0x0d01 -static struct pci_device_id toshoboe_pci_tbl[] __initdata = { +static struct pci_device_id toshoboe_pci_tbl[] = { { PCI_VENDOR_ID_TOSHIBA, PCI_DEVICE_ID_FIR701, PCI_ANY_ID, PCI_ANY_ID, }, { PCI_VENDOR_ID_TOSHIBA, PCI_DEVICE_ID_FIR701b, PCI_ANY_ID, PCI_ANY_ID, }, { } /* Terminating entry */ diff -Nru a/drivers/net/irda/vlsi_ir.c b/drivers/net/irda/vlsi_ir.c --- a/drivers/net/irda/vlsi_ir.c Fri Aug 1 12:18:47 2003 +++ b/drivers/net/irda/vlsi_ir.c Fri Aug 1 12:18:47 2003 @@ -57,7 +57,7 @@ #define PCI_CLASS_WIRELESS_IRDA 0x0d00 -static struct pci_device_id vlsi_irda_table [] __devinitdata = { { +static struct pci_device_id vlsi_irda_table [] = { { .class = PCI_CLASS_WIRELESS_IRDA << 8, .vendor = PCI_VENDOR_ID_VLSI, diff -Nru a/drivers/net/ixgb/ixgb_main.c b/drivers/net/ixgb/ixgb_main.c --- a/drivers/net/ixgb/ixgb_main.c Fri Aug 1 12:18:47 2003 +++ b/drivers/net/ixgb/ixgb_main.c Fri Aug 1 12:18:47 2003 @@ -44,7 +44,7 @@ * { Vendor ID, Device ID, SubVendor ID, SubDevice ID, * Class, Class Mask, String Index } */ -static struct pci_device_id ixgb_pci_tbl[] __devinitdata = { +static struct pci_device_id ixgb_pci_tbl[] = { /* Intel(R) PRO/10GbE Network Connection */ {INTEL_VENDOR_ID, IXGB_DEVICE_ID_82597EX, INTEL_SUBVENDOR_ID, IXGB_SUBDEVICE_ID_A11F, 0, 0, 0}, diff -Nru a/drivers/net/natsemi.c b/drivers/net/natsemi.c --- a/drivers/net/natsemi.c Fri Aug 1 12:18:47 2003 +++ b/drivers/net/natsemi.c Fri Aug 1 12:18:47 2003 @@ -366,7 +366,7 @@ { "NatSemi DP8381[56]", PCI_IOTYPE }, }; -static struct pci_device_id natsemi_pci_tbl[] __devinitdata = { +static struct pci_device_id natsemi_pci_tbl[] = { { PCI_VENDOR_ID_NS, PCI_DEVICE_ID_NS_83815, PCI_ANY_ID, PCI_ANY_ID, }, { 0, }, }; diff -Nru a/drivers/net/ne2k-pci.c b/drivers/net/ne2k-pci.c --- a/drivers/net/ne2k-pci.c Fri Aug 1 12:18:47 2003 +++ b/drivers/net/ne2k-pci.c Fri Aug 1 12:18:47 2003 @@ -136,7 +136,7 @@ }; -static struct pci_device_id ne2k_pci_tbl[] __devinitdata = { +static struct pci_device_id ne2k_pci_tbl[] = { { 0x10ec, 0x8029, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CH_RealTek_RTL_8029 }, { 0x1050, 0x0940, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CH_Winbond_89C940 }, { 0x11f6, 0x1401, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CH_Compex_RL2000 }, diff -Nru a/drivers/net/ns83820.c b/drivers/net/ns83820.c --- a/drivers/net/ns83820.c Fri Aug 1 12:18:48 2003 +++ b/drivers/net/ns83820.c Fri Aug 1 12:18:48 2003 @@ -2061,7 +2061,7 @@ pci_set_drvdata(pci_dev, NULL); } -static struct pci_device_id ns83820_pci_tbl[] __devinitdata = { +static struct pci_device_id ns83820_pci_tbl[] = { { 0x100b, 0x0022, PCI_ANY_ID, PCI_ANY_ID, 0, .driver_data = 0, }, { 0, }, }; diff -Nru a/drivers/net/pci-skeleton.c b/drivers/net/pci-skeleton.c --- a/drivers/net/pci-skeleton.c Fri Aug 1 12:18:47 2003 +++ b/drivers/net/pci-skeleton.c Fri Aug 1 12:18:47 2003 @@ -212,7 +212,7 @@ }; -static struct pci_device_id netdrv_pci_tbl[] __devinitdata = { +static struct pci_device_id netdrv_pci_tbl[] = { {0x10ec, 0x8139, PCI_ANY_ID, PCI_ANY_ID, 0, 0, RTL8139 }, {0x10ec, 0x8138, PCI_ANY_ID, PCI_ANY_ID, 0, 0, NETDRV_CB }, {0x1113, 0x1211, PCI_ANY_ID, PCI_ANY_ID, 0, 0, SMC1211TX }, diff -Nru a/drivers/net/pcnet32.c b/drivers/net/pcnet32.c --- a/drivers/net/pcnet32.c Fri Aug 1 12:18:47 2003 +++ b/drivers/net/pcnet32.c Fri Aug 1 12:18:47 2003 @@ -55,7 +55,7 @@ /* * PCI device identifiers for "new style" Linux PCI Device Drivers */ -static struct pci_device_id pcnet32_pci_tbl[] __devinitdata = { +static struct pci_device_id pcnet32_pci_tbl[] = { { PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_LANCE_HOME, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 }, { PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_LANCE, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 }, { 0, } diff -Nru a/drivers/net/r8169.c b/drivers/net/r8169.c --- a/drivers/net/r8169.c Fri Aug 1 12:18:48 2003 +++ b/drivers/net/r8169.c Fri Aug 1 12:18:48 2003 @@ -107,7 +107,7 @@ { "RealTek RTL8169 Gigabit Ethernet"},}; -static struct pci_device_id rtl8169_pci_tbl[] __devinitdata = { +static struct pci_device_id rtl8169_pci_tbl[] = { {0x10ec, 0x8169, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, {0,}, }; diff -Nru a/drivers/net/rcpci45.c b/drivers/net/rcpci45.c --- a/drivers/net/rcpci45.c Fri Aug 1 12:18:48 2003 +++ b/drivers/net/rcpci45.c Fri Aug 1 12:18:48 2003 @@ -118,7 +118,7 @@ static void RCreboot_callback (U32, U32, U32, struct net_device *); static int RC_allocate_and_post_buffers (struct net_device *, int); -static struct pci_device_id rcpci45_pci_table[] __devinitdata = { +static struct pci_device_id rcpci45_pci_table[] = { { PCI_VENDOR_ID_REDCREEK, PCI_DEVICE_ID_RC45, PCI_ANY_ID, PCI_ANY_ID,}, {} }; diff -Nru a/drivers/net/rrunner.c b/drivers/net/rrunner.c --- a/drivers/net/rrunner.c Fri Aug 1 12:18:47 2003 +++ b/drivers/net/rrunner.c Fri Aug 1 12:18:47 2003 @@ -1716,7 +1716,7 @@ } } -static struct pci_device_id rr_pci_tbl[] __devinitdata = { +static struct pci_device_id rr_pci_tbl[] = { { PCI_VENDOR_ID_ESSENTIAL, PCI_DEVICE_ID_ESSENTIAL_ROADRUNNER, PCI_ANY_ID, PCI_ANY_ID, }, { 0,} diff -Nru a/drivers/net/sis900.c b/drivers/net/sis900.c --- a/drivers/net/sis900.c Fri Aug 1 12:18:47 2003 +++ b/drivers/net/sis900.c Fri Aug 1 12:18:47 2003 @@ -97,7 +97,7 @@ "SiS 900 PCI Fast Ethernet", "SiS 7016 PCI Fast Ethernet" }; -static struct pci_device_id sis900_pci_tbl [] __devinitdata = { +static struct pci_device_id sis900_pci_tbl [] = { {PCI_VENDOR_ID_SI, PCI_DEVICE_ID_SI_900, PCI_ANY_ID, PCI_ANY_ID, 0, 0, SIS_900}, {PCI_VENDOR_ID_SI, PCI_DEVICE_ID_SI_7016, diff -Nru a/drivers/net/sk98lin/skge.c b/drivers/net/sk98lin/skge.c --- a/drivers/net/sk98lin/skge.c Fri Aug 1 12:18:47 2003 +++ b/drivers/net/sk98lin/skge.c Fri Aug 1 12:18:47 2003 @@ -4032,7 +4032,7 @@ #endif /* DEBUG */ -static struct pci_device_id skge_pci_tbl[] __devinitdata = { +static struct pci_device_id skge_pci_tbl[] = { { PCI_VENDOR_ID_SYSKONNECT, PCI_DEVICE_ID_SYSKONNECT_GE, PCI_ANY_ID, PCI_ANY_ID, }, { 0,} diff -Nru a/drivers/net/starfire.c b/drivers/net/starfire.c --- a/drivers/net/starfire.c Fri Aug 1 12:18:47 2003 +++ b/drivers/net/starfire.c Fri Aug 1 12:18:47 2003 @@ -487,7 +487,7 @@ CH_6915 = 0, }; -static struct pci_device_id starfire_pci_tbl[] __devinitdata = { +static struct pci_device_id starfire_pci_tbl[] = { { 0x9004, 0x6915, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CH_6915 }, { 0, } }; diff -Nru a/drivers/net/sundance.c b/drivers/net/sundance.c --- a/drivers/net/sundance.c Fri Aug 1 12:18:48 2003 +++ b/drivers/net/sundance.c Fri Aug 1 12:18:48 2003 @@ -284,7 +284,7 @@ #define USE_IO_OPS 1 #endif -static struct pci_device_id sundance_pci_tbl[] __devinitdata = { +static struct pci_device_id sundance_pci_tbl[] = { {0x1186, 0x1002, 0x1186, 0x1002, 0, 0, 0}, {0x1186, 0x1002, 0x1186, 0x1003, 0, 0, 1}, {0x1186, 0x1002, 0x1186, 0x1012, 0, 0, 2}, diff -Nru a/drivers/net/sungem.c b/drivers/net/sungem.c --- a/drivers/net/sungem.c Fri Aug 1 12:18:48 2003 +++ b/drivers/net/sungem.c Fri Aug 1 12:18:48 2003 @@ -84,7 +84,7 @@ #define GEM_MODULE_NAME "gem" #define PFX GEM_MODULE_NAME ": " -static struct pci_device_id gem_pci_tbl[] __devinitdata = { +static struct pci_device_id gem_pci_tbl[] = { { PCI_VENDOR_ID_SUN, PCI_DEVICE_ID_SUN_GEM, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0UL }, diff -Nru a/drivers/net/sunhme.c b/drivers/net/sunhme.c --- a/drivers/net/sunhme.c Fri Aug 1 12:18:47 2003 +++ b/drivers/net/sunhme.c Fri Aug 1 12:18:47 2003 @@ -177,7 +177,7 @@ /* This happy_pci_ids is declared __initdata because it is only used as an advisory to depmod. If this is ported to the new PCI interface where it could be referenced at any time due to hot plugging, - it should be changed to __devinitdata. */ + the __initdata reference should be removed. */ struct pci_device_id happymeal_pci_ids[] __initdata = { { diff -Nru a/drivers/net/tc35815.c b/drivers/net/tc35815.c --- a/drivers/net/tc35815.c Fri Aug 1 12:18:47 2003 +++ b/drivers/net/tc35815.c Fri Aug 1 12:18:47 2003 @@ -469,7 +469,7 @@ /* * PCI device identifiers for "new style" Linux PCI Device Drivers */ -static struct pci_device_id tc35815_pci_tbl[] __devinitdata = { +static struct pci_device_id tc35815_pci_tbl[] = { { PCI_VENDOR_ID_TOSHIBA_2, PCI_DEVICE_ID_TOSHIBA_TC35815CF, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 }, { 0, } }; diff -Nru a/drivers/net/tg3.c b/drivers/net/tg3.c --- a/drivers/net/tg3.c Fri Aug 1 12:18:48 2003 +++ b/drivers/net/tg3.c Fri Aug 1 12:18:48 2003 @@ -127,7 +127,7 @@ static int tg3_debug = -1; /* -1 == use TG3_DEF_MSG_ENABLE as value */ -static struct pci_device_id tg3_pci_tbl[] __devinitdata = { +static struct pci_device_id tg3_pci_tbl[] = { { PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_TIGON3_5700, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0UL }, { PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_TIGON3_5701, diff -Nru a/drivers/net/tlan.c b/drivers/net/tlan.c --- a/drivers/net/tlan.c Fri Aug 1 12:18:47 2003 +++ b/drivers/net/tlan.c Fri Aug 1 12:18:47 2003 @@ -252,7 +252,7 @@ { "Compaq NetFlex-3/E", TLAN_ADAPTER_ACTIVITY_LED, 0x83 }, /* EISA card */ }; -static struct pci_device_id tlan_pci_tbl[] __devinitdata = { +static struct pci_device_id tlan_pci_tbl[] = { { PCI_VENDOR_ID_COMPAQ, PCI_DEVICE_ID_COMPAQ_NETEL10, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 }, { PCI_VENDOR_ID_COMPAQ, PCI_DEVICE_ID_COMPAQ_NETEL100, diff -Nru a/drivers/net/tokenring/3c359.c b/drivers/net/tokenring/3c359.c --- a/drivers/net/tokenring/3c359.c Fri Aug 1 12:18:48 2003 +++ b/drivers/net/tokenring/3c359.c Fri Aug 1 12:18:48 2003 @@ -116,7 +116,7 @@ #include "3c359_microcode.h" -static struct pci_device_id xl_pci_tbl[] __devinitdata = +static struct pci_device_id xl_pci_tbl[] = { {PCI_VENDOR_ID_3COM,PCI_DEVICE_ID_3COM_3C359, PCI_ANY_ID, PCI_ANY_ID, }, { } /* terminate list */ diff -Nru a/drivers/net/tokenring/abyss.c b/drivers/net/tokenring/abyss.c --- a/drivers/net/tokenring/abyss.c Fri Aug 1 12:18:47 2003 +++ b/drivers/net/tokenring/abyss.c Fri Aug 1 12:18:47 2003 @@ -45,7 +45,7 @@ #define ABYSS_IO_EXTENT 64 -static struct pci_device_id abyss_pci_tbl[] __initdata = { +static struct pci_device_id abyss_pci_tbl[] = { { PCI_VENDOR_ID_MADGE, PCI_DEVICE_ID_MADGE_MK2, PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_NETWORK_TOKEN_RING << 8, 0x00ffffff, }, { } /* Terminating entry */ diff -Nru a/drivers/net/tokenring/lanstreamer.c b/drivers/net/tokenring/lanstreamer.c --- a/drivers/net/tokenring/lanstreamer.c Fri Aug 1 12:18:48 2003 +++ b/drivers/net/tokenring/lanstreamer.c Fri Aug 1 12:18:48 2003 @@ -140,7 +140,7 @@ static char version[] = "LanStreamer.c v0.4.0 03/08/01 - Mike Sullivan\n" " v0.5.3 11/13/02 - Kent Yoder"; -static struct pci_device_id streamer_pci_tbl[] __initdata = { +static struct pci_device_id streamer_pci_tbl[] = { { PCI_VENDOR_ID_IBM, PCI_DEVICE_ID_IBM_TR, PCI_ANY_ID, PCI_ANY_ID,}, {} /* terminating entry */ }; diff -Nru a/drivers/net/tokenring/olympic.c b/drivers/net/tokenring/olympic.c --- a/drivers/net/tokenring/olympic.c Fri Aug 1 12:18:48 2003 +++ b/drivers/net/tokenring/olympic.c Fri Aug 1 12:18:48 2003 @@ -171,7 +171,7 @@ static int network_monitor[OLYMPIC_MAX_ADAPTERS] = {0,}; MODULE_PARM(network_monitor, "1-" __MODULE_STRING(OLYMPIC_MAX_ADAPTERS) "i"); -static struct pci_device_id olympic_pci_tbl[] __devinitdata = { +static struct pci_device_id olympic_pci_tbl[] = { {PCI_VENDOR_ID_IBM,PCI_DEVICE_ID_IBM_TR_WAKE,PCI_ANY_ID,PCI_ANY_ID,}, { } /* Terminating Entry */ }; diff -Nru a/drivers/net/tokenring/tmspci.c b/drivers/net/tokenring/tmspci.c --- a/drivers/net/tokenring/tmspci.c Fri Aug 1 12:18:48 2003 +++ b/drivers/net/tokenring/tmspci.c Fri Aug 1 12:18:48 2003 @@ -57,7 +57,7 @@ { {0x03, 0x01}, "3Com Token Link Velocity"}, }; -static struct pci_device_id tmspci_pci_tbl[] __initdata = { +static struct pci_device_id tmspci_pci_tbl[] = { { PCI_VENDOR_ID_COMPAQ, PCI_DEVICE_ID_COMPAQ_TOKENRING, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 }, { PCI_VENDOR_ID_SYSKONNECT, PCI_DEVICE_ID_SYSKONNECT_TR, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 1 }, { PCI_VENDOR_ID_TCONRAD, PCI_DEVICE_ID_TCONRAD_TOKENRING, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 2 }, diff -Nru a/drivers/net/tulip/de2104x.c b/drivers/net/tulip/de2104x.c --- a/drivers/net/tulip/de2104x.c Fri Aug 1 12:18:48 2003 +++ b/drivers/net/tulip/de2104x.c Fri Aug 1 12:18:48 2003 @@ -329,7 +329,7 @@ static unsigned int de_ok_to_advertise (struct de_private *de, u32 new_media); -static struct pci_device_id de_pci_tbl[] __initdata = { +static struct pci_device_id de_pci_tbl[] = { { PCI_VENDOR_ID_DEC, PCI_DEVICE_ID_DEC_TULIP, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 }, { PCI_VENDOR_ID_DEC, PCI_DEVICE_ID_DEC_TULIP_PLUS, diff -Nru a/drivers/net/tulip/dmfe.c b/drivers/net/tulip/dmfe.c --- a/drivers/net/tulip/dmfe.c Fri Aug 1 12:18:48 2003 +++ b/drivers/net/tulip/dmfe.c Fri Aug 1 12:18:48 2003 @@ -1975,7 +1975,7 @@ -static struct pci_device_id dmfe_pci_tbl[] __devinitdata = { +static struct pci_device_id dmfe_pci_tbl[] = { { 0x1282, 0x9132, PCI_ANY_ID, PCI_ANY_ID, 0, 0, PCI_DM9132_ID }, { 0x1282, 0x9102, PCI_ANY_ID, PCI_ANY_ID, 0, 0, PCI_DM9102_ID }, { 0x1282, 0x9100, PCI_ANY_ID, PCI_ANY_ID, 0, 0, PCI_DM9100_ID }, diff -Nru a/drivers/net/tulip/tulip_core.c b/drivers/net/tulip/tulip_core.c --- a/drivers/net/tulip/tulip_core.c Fri Aug 1 12:18:48 2003 +++ b/drivers/net/tulip/tulip_core.c Fri Aug 1 12:18:48 2003 @@ -194,7 +194,7 @@ }; -static struct pci_device_id tulip_pci_tbl[] __devinitdata = { +static struct pci_device_id tulip_pci_tbl[] = { { 0x1011, 0x0009, PCI_ANY_ID, PCI_ANY_ID, 0, 0, DC21140 }, { 0x1011, 0x0019, PCI_ANY_ID, PCI_ANY_ID, 0, 0, DC21143 }, { 0x11AD, 0x0002, PCI_ANY_ID, PCI_ANY_ID, 0, 0, LC82C168 }, diff -Nru a/drivers/net/tulip/winbond-840.c b/drivers/net/tulip/winbond-840.c --- a/drivers/net/tulip/winbond-840.c Fri Aug 1 12:18:47 2003 +++ b/drivers/net/tulip/winbond-840.c Fri Aug 1 12:18:47 2003 @@ -234,7 +234,7 @@ #define W840_FLAGS (PCI_USES_MEM | PCI_ADDR1 | PCI_USES_MASTER) #endif -static struct pci_device_id w840_pci_tbl[] __devinitdata = { +static struct pci_device_id w840_pci_tbl[] = { { 0x1050, 0x0840, PCI_ANY_ID, 0x8153, 0, 0, 0 }, { 0x1050, 0x0840, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 1 }, { 0x11f6, 0x2011, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 2 }, diff -Nru a/drivers/net/tulip/xircom_cb.c b/drivers/net/tulip/xircom_cb.c --- a/drivers/net/tulip/xircom_cb.c Fri Aug 1 12:18:48 2003 +++ b/drivers/net/tulip/xircom_cb.c Fri Aug 1 12:18:48 2003 @@ -140,7 +140,7 @@ -static struct pci_device_id xircom_pci_table[] __devinitdata = { +static struct pci_device_id xircom_pci_table[] = { {0x115D, 0x0003, PCI_ANY_ID, PCI_ANY_ID,}, {0,}, }; diff -Nru a/drivers/net/tulip/xircom_tulip_cb.c b/drivers/net/tulip/xircom_tulip_cb.c --- a/drivers/net/tulip/xircom_tulip_cb.c Fri Aug 1 12:18:47 2003 +++ b/drivers/net/tulip/xircom_tulip_cb.c Fri Aug 1 12:18:47 2003 @@ -1654,7 +1654,7 @@ } -static struct pci_device_id xircom_pci_table[] __devinitdata = { +static struct pci_device_id xircom_pci_table[] = { { 0x115D, 0x0003, PCI_ANY_ID, PCI_ANY_ID, 0, 0, X3201_3 }, {0}, }; diff -Nru a/drivers/net/typhoon.c b/drivers/net/typhoon.c --- a/drivers/net/typhoon.c Fri Aug 1 12:18:48 2003 +++ b/drivers/net/typhoon.c Fri Aug 1 12:18:48 2003 @@ -192,7 +192,7 @@ * bit 8 indicates if this is a (0) copper or (1) fiber card * bits 12-16 indicate card type: (0) client and (1) server */ -static struct pci_device_id typhoon_pci_tbl[] __devinitdata = { +static struct pci_device_id typhoon_pci_tbl[] = { { PCI_VENDOR_ID_3COM, PCI_DEVICE_ID_3COM_3CR990, PCI_ANY_ID, PCI_ANY_ID, 0, 0,TYPHOON_TX }, { PCI_VENDOR_ID_3COM, PCI_DEVICE_ID_3COM_3CR990_TX_95, diff -Nru a/drivers/net/via-rhine.c b/drivers/net/via-rhine.c --- a/drivers/net/via-rhine.c Fri Aug 1 12:18:48 2003 +++ b/drivers/net/via-rhine.c Fri Aug 1 12:18:48 2003 @@ -401,7 +401,7 @@ CanHaveMII | HasWOL }, }; -static struct pci_device_id via_rhine_pci_tbl[] __devinitdata = +static struct pci_device_id via_rhine_pci_tbl[] = { {0x1106, 0x3043, PCI_ANY_ID, PCI_ANY_ID, 0, 0, VT86C100A}, {0x1106, 0x3065, PCI_ANY_ID, PCI_ANY_ID, 0, 0, VT6102}, diff -Nru a/drivers/net/wan/dscc4.c b/drivers/net/wan/dscc4.c --- a/drivers/net/wan/dscc4.c Fri Aug 1 12:18:47 2003 +++ b/drivers/net/wan/dscc4.c Fri Aug 1 12:18:47 2003 @@ -1867,7 +1867,7 @@ __setup("dscc4.setup=", dscc4_setup); -static struct pci_device_id dscc4_pci_tbl[] __devinitdata = { +static struct pci_device_id dscc4_pci_tbl[] = { { PCI_VENDOR_ID_SIEMENS, PCI_DEVICE_ID_SIEMENS_DSCC4, PCI_ANY_ID, PCI_ANY_ID, }, { 0,} diff -Nru a/drivers/net/wan/farsync.c b/drivers/net/wan/farsync.c --- a/drivers/net/wan/farsync.c Fri Aug 1 12:18:48 2003 +++ b/drivers/net/wan/farsync.c Fri Aug 1 12:18:48 2003 @@ -414,7 +414,7 @@ /* * PCI ID lookup table */ -static struct pci_device_id fst_pci_dev_id[] __devinitdata = { +static struct pci_device_id fst_pci_dev_id[] = { { FSC_PCI_VENDOR_ID, T2P_PCI_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID, 0, 0, FST_TYPE_T2P }, { FSC_PCI_VENDOR_ID, T4P_PCI_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID, 0, 0, diff -Nru a/drivers/net/wan/lmc/lmc_main.c b/drivers/net/wan/lmc/lmc_main.c --- a/drivers/net/wan/lmc/lmc_main.c Fri Aug 1 12:18:47 2003 +++ b/drivers/net/wan/lmc/lmc_main.c Fri Aug 1 12:18:47 2003 @@ -88,7 +88,7 @@ int LMC_PKT_BUF_SZ = 1542; #ifdef MODULE -static struct pci_device_id lmc_pci_tbl[] __devinitdata = { +static struct pci_device_id lmc_pci_tbl[] = { { 0x1011, 0x009, 0x1379, PCI_ANY_ID, 0, 0, 0}, { 0, } }; diff -Nru a/drivers/net/wan/pc300_drv.c b/drivers/net/wan/pc300_drv.c --- a/drivers/net/wan/pc300_drv.c Fri Aug 1 12:18:48 2003 +++ b/drivers/net/wan/pc300_drv.c Fri Aug 1 12:18:48 2003 @@ -253,7 +253,7 @@ #undef PC300_DEBUG_RX #undef PC300_DEBUG_OTHER -static struct pci_device_id cpc_pci_dev_id[] __devinitdata = { +static struct pci_device_id cpc_pci_dev_id[] = { /* PC300/RSV or PC300/X21, 2 chan */ {0x120e, 0x300, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0x300}, /* PC300/RSV or PC300/X21, 1 chan */ diff -Nru a/drivers/net/wireless/airo.c b/drivers/net/wireless/airo.c --- a/drivers/net/wireless/airo.c Fri Aug 1 12:18:47 2003 +++ b/drivers/net/wireless/airo.c Fri Aug 1 12:18:47 2003 @@ -47,7 +47,7 @@ #include <asm/uaccess.h> #ifdef CONFIG_PCI -static struct pci_device_id card_ids[] __devinitdata = { +static struct pci_device_id card_ids[] = { { 0x14b9, 1, PCI_ANY_ID, PCI_ANY_ID, }, { 0x14b9, 0x4500, PCI_ANY_ID, PCI_ANY_ID }, { 0x14b9, 0x4800, PCI_ANY_ID, PCI_ANY_ID, }, diff -Nru a/drivers/net/wireless/orinoco_pci.c b/drivers/net/wireless/orinoco_pci.c --- a/drivers/net/wireless/orinoco_pci.c Fri Aug 1 12:18:48 2003 +++ b/drivers/net/wireless/orinoco_pci.c Fri Aug 1 12:18:48 2003 @@ -359,7 +359,7 @@ return 0; } -static struct pci_device_id orinoco_pci_pci_id_table[] __devinitdata = { +static struct pci_device_id orinoco_pci_pci_id_table[] = { {0x1260, 0x3873, PCI_ANY_ID, PCI_ANY_ID,}, {0,}, }; diff -Nru a/drivers/net/wireless/orinoco_plx.c b/drivers/net/wireless/orinoco_plx.c --- a/drivers/net/wireless/orinoco_plx.c Fri Aug 1 12:18:48 2003 +++ b/drivers/net/wireless/orinoco_plx.c Fri Aug 1 12:18:48 2003 @@ -299,7 +299,7 @@ } -static struct pci_device_id orinoco_plx_pci_id_table[] __devinitdata = { +static struct pci_device_id orinoco_plx_pci_id_table[] = { {0x111a, 0x1023, PCI_ANY_ID, PCI_ANY_ID,}, /* Siemens SpeedStream SS1023 */ {0x1385, 0x4100, PCI_ANY_ID, PCI_ANY_ID,}, /* Netgear MA301 */ {0x15e8, 0x0130, PCI_ANY_ID, PCI_ANY_ID,}, /* Correga - does this work? */ diff -Nru a/drivers/net/wireless/orinoco_tmd.c b/drivers/net/wireless/orinoco_tmd.c --- a/drivers/net/wireless/orinoco_tmd.c Fri Aug 1 12:18:47 2003 +++ b/drivers/net/wireless/orinoco_tmd.c Fri Aug 1 12:18:47 2003 @@ -190,7 +190,7 @@ } -static struct pci_device_id orinoco_tmd_pci_id_table[] __devinitdata = { +static struct pci_device_id orinoco_tmd_pci_id_table[] = { {0x15e8, 0x0131, PCI_ANY_ID, PCI_ANY_ID,}, /* NDC and OEMs, e.g. pheecom */ {0,}, }; diff -Nru a/drivers/net/yellowfin.c b/drivers/net/yellowfin.c --- a/drivers/net/yellowfin.c Fri Aug 1 12:18:47 2003 +++ b/drivers/net/yellowfin.c Fri Aug 1 12:18:47 2003 @@ -295,7 +295,7 @@ {0,}, }; -static struct pci_device_id yellowfin_pci_tbl[] __devinitdata = { +static struct pci_device_id yellowfin_pci_tbl[] = { { 0x1000, 0x0702, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 }, { 0x1000, 0x0701, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 1 }, { 0, } ^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH] PCI fixes for 2.6.0-test2 2003-08-01 19:31 ` Greg KH @ 2003-08-01 19:31 ` Greg KH 2003-08-01 19:32 ` Greg KH 0 siblings, 1 reply; 9+ messages in thread From: Greg KH @ 2003-08-01 19:31 UTC (permalink / raw) To: linux-kernel ChangeSet 1.1547.10.4, 2003/07/31 16:07:47-07:00, greg@kroah.com [PATCH] PCI: pci_device_id can not be marked __devinitdata. Last straggler in arch/mips/* arch/mips/vr41xx/common/vrc4173.c | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) diff -Nru a/arch/mips/vr41xx/common/vrc4173.c b/arch/mips/vr41xx/common/vrc4173.c --- a/arch/mips/vr41xx/common/vrc4173.c Fri Aug 1 12:18:29 2003 +++ b/arch/mips/vr41xx/common/vrc4173.c Fri Aug 1 12:18:29 2003 @@ -53,7 +53,7 @@ #define VRC4173_SYSINT1REG 0x060 #define VRC4173_MSYSINT1REG 0x06c -static struct pci_device_id vrc4173_table[] __devinitdata = { +static struct pci_device_id vrc4173_table[] = { {PCI_VENDOR_ID_NEC, PCI_DEVICE_ID_NEC_VRC4173, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, {0, } }; ^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH] PCI fixes for 2.6.0-test2 2003-08-01 19:31 ` Greg KH @ 2003-08-01 19:32 ` Greg KH 2003-08-01 19:32 ` Greg KH 0 siblings, 1 reply; 9+ messages in thread From: Greg KH @ 2003-08-01 19:32 UTC (permalink / raw) To: linux-kernel ChangeSet 1.1547.10.5, 2003/07/31 16:09:44-07:00, greg@kroah.com [PATCH] PCI: pci_device_id can not be marked __devinitdata. fixes up drivers/i2c/* drivers/ide/* and drivers/ieee1394/* drivers/i2c/busses/i2c-ali1535.c | 2 +- drivers/i2c/busses/i2c-ali15x3.c | 2 +- drivers/i2c/busses/i2c-amd756.c | 2 +- drivers/i2c/busses/i2c-amd8111.c | 2 +- drivers/i2c/busses/i2c-i801.c | 2 +- drivers/i2c/busses/i2c-piix4.c | 2 +- drivers/i2c/busses/i2c-sis96x.c | 2 +- drivers/i2c/busses/i2c-viapro.c | 2 +- drivers/i2c/chips/via686a.c | 2 +- drivers/i2c/i2c-prosavage.c | 2 +- drivers/ide/pci/aec62xx.c | 2 +- drivers/ide/pci/alim15x3.c | 2 +- drivers/ide/pci/amd74xx.c | 2 +- drivers/ide/pci/cmd64x.c | 2 +- drivers/ide/pci/cs5520.c | 2 +- drivers/ide/pci/cs5530.c | 2 +- drivers/ide/pci/cy82c693.c | 2 +- drivers/ide/pci/generic.c | 2 +- drivers/ide/pci/hpt34x.c | 2 +- drivers/ide/pci/hpt366.c | 2 +- drivers/ide/pci/it8172.c | 2 +- drivers/ide/pci/ns87415.c | 2 +- drivers/ide/pci/opti621.c | 2 +- drivers/ide/pci/pdc202xx_new.c | 2 +- drivers/ide/pci/pdc202xx_old.c | 2 +- drivers/ide/pci/pdcadma.c | 2 +- drivers/ide/pci/piix.c | 2 +- drivers/ide/pci/rz1000.c | 2 +- drivers/ide/pci/sc1200.c | 2 +- drivers/ide/pci/serverworks.c | 2 +- drivers/ide/pci/siimage.c | 2 +- drivers/ide/pci/sis5513.c | 2 +- drivers/ide/pci/sl82c105.c | 2 +- drivers/ide/pci/slc90e66.c | 2 +- drivers/ide/pci/triflex.h | 2 +- drivers/ide/pci/trm290.c | 2 +- drivers/ide/pci/via82cxxx.c | 2 +- drivers/ieee1394/ohci1394.c | 2 +- drivers/ieee1394/pcilynx.c | 2 +- 39 files changed, 39 insertions(+), 39 deletions(-) diff -Nru a/drivers/i2c/busses/i2c-ali1535.c b/drivers/i2c/busses/i2c-ali1535.c --- a/drivers/i2c/busses/i2c-ali1535.c Fri Aug 1 12:18:18 2003 +++ b/drivers/i2c/busses/i2c-ali1535.c Fri Aug 1 12:18:18 2003 @@ -494,7 +494,7 @@ } }; -static struct pci_device_id ali1535_ids[] __devinitdata = { +static struct pci_device_id ali1535_ids[] = { { .vendor = PCI_VENDOR_ID_AL, .device = PCI_DEVICE_ID_AL_M7101, diff -Nru a/drivers/i2c/busses/i2c-ali15x3.c b/drivers/i2c/busses/i2c-ali15x3.c --- a/drivers/i2c/busses/i2c-ali15x3.c Fri Aug 1 12:18:18 2003 +++ b/drivers/i2c/busses/i2c-ali15x3.c Fri Aug 1 12:18:18 2003 @@ -486,7 +486,7 @@ }, }; -static struct pci_device_id ali15x3_ids[] __devinitdata = { +static struct pci_device_id ali15x3_ids[] = { { .vendor = PCI_VENDOR_ID_AL, .device = PCI_DEVICE_ID_AL_M7101, diff -Nru a/drivers/i2c/busses/i2c-amd756.c b/drivers/i2c/busses/i2c-amd756.c --- a/drivers/i2c/busses/i2c-amd756.c Fri Aug 1 12:18:18 2003 +++ b/drivers/i2c/busses/i2c-amd756.c Fri Aug 1 12:18:18 2003 @@ -322,7 +322,7 @@ enum chiptype { AMD756, AMD766, AMD768, NFORCE }; -static struct pci_device_id amd756_ids[] __devinitdata = { +static struct pci_device_id amd756_ids[] = { {PCI_VENDOR_ID_AMD, 0x740B, PCI_ANY_ID, PCI_ANY_ID, 0, 0, AMD756 }, {PCI_VENDOR_ID_AMD, 0x7413, PCI_ANY_ID, PCI_ANY_ID, 0, 0, AMD766 }, {PCI_VENDOR_ID_AMD, 0x7443, PCI_ANY_ID, PCI_ANY_ID, 0, 0, AMD768 }, diff -Nru a/drivers/i2c/busses/i2c-amd8111.c b/drivers/i2c/busses/i2c-amd8111.c --- a/drivers/i2c/busses/i2c-amd8111.c Fri Aug 1 12:18:18 2003 +++ b/drivers/i2c/busses/i2c-amd8111.c Fri Aug 1 12:18:18 2003 @@ -331,7 +331,7 @@ }; -static struct pci_device_id amd8111_ids[] __devinitdata = { +static struct pci_device_id amd8111_ids[] = { { 0x1022, 0x746a, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 }, { 0, } }; diff -Nru a/drivers/i2c/busses/i2c-i801.c b/drivers/i2c/busses/i2c-i801.c --- a/drivers/i2c/busses/i2c-i801.c Fri Aug 1 12:18:18 2003 +++ b/drivers/i2c/busses/i2c-i801.c Fri Aug 1 12:18:18 2003 @@ -556,7 +556,7 @@ }, }; -static struct pci_device_id i801_ids[] __devinitdata = { +static struct pci_device_id i801_ids[] = { { .vendor = PCI_VENDOR_ID_INTEL, .device = PCI_DEVICE_ID_INTEL_82801AA_3, diff -Nru a/drivers/i2c/busses/i2c-piix4.c b/drivers/i2c/busses/i2c-piix4.c --- a/drivers/i2c/busses/i2c-piix4.c Fri Aug 1 12:18:18 2003 +++ b/drivers/i2c/busses/i2c-piix4.c Fri Aug 1 12:18:18 2003 @@ -402,7 +402,7 @@ }, }; -static struct pci_device_id piix4_ids[] __devinitdata = { +static struct pci_device_id piix4_ids[] = { { .vendor = PCI_VENDOR_ID_INTEL, .device = PCI_DEVICE_ID_INTEL_82371AB_3, diff -Nru a/drivers/i2c/busses/i2c-sis96x.c b/drivers/i2c/busses/i2c-sis96x.c --- a/drivers/i2c/busses/i2c-sis96x.c Fri Aug 1 12:18:18 2003 +++ b/drivers/i2c/busses/i2c-sis96x.c Fri Aug 1 12:18:18 2003 @@ -276,7 +276,7 @@ }, }; -static struct pci_device_id sis96x_ids[] __devinitdata = { +static struct pci_device_id sis96x_ids[] = { { .vendor = PCI_VENDOR_ID_SI, diff -Nru a/drivers/i2c/busses/i2c-viapro.c b/drivers/i2c/busses/i2c-viapro.c --- a/drivers/i2c/busses/i2c-viapro.c Fri Aug 1 12:18:18 2003 +++ b/drivers/i2c/busses/i2c-viapro.c Fri Aug 1 12:18:18 2003 @@ -401,7 +401,7 @@ release_region(vt596_smba, 8); } -static struct pci_device_id vt596_ids[] __devinitdata = { +static struct pci_device_id vt596_ids[] = { { .vendor = PCI_VENDOR_ID_VIA, .device = PCI_DEVICE_ID_VIA_82C596_3, diff -Nru a/drivers/i2c/chips/via686a.c b/drivers/i2c/chips/via686a.c --- a/drivers/i2c/chips/via686a.c Fri Aug 1 12:18:18 2003 +++ b/drivers/i2c/chips/via686a.c Fri Aug 1 12:18:18 2003 @@ -914,7 +914,7 @@ up(&data->update_lock); } -static struct pci_device_id via686a_pci_ids[] __devinitdata = { +static struct pci_device_id via686a_pci_ids[] = { { .vendor = PCI_VENDOR_ID_VIA, .device = PCI_DEVICE_ID_VIA_82C686_4, diff -Nru a/drivers/i2c/i2c-prosavage.c b/drivers/i2c/i2c-prosavage.c --- a/drivers/i2c/i2c-prosavage.c Fri Aug 1 12:18:18 2003 +++ b/drivers/i2c/i2c-prosavage.c Fri Aug 1 12:18:18 2003 @@ -321,7 +321,7 @@ /* * Data for PCI driver interface */ -static struct pci_device_id prosavage_pci_tbl[] __devinitdata = { +static struct pci_device_id prosavage_pci_tbl[] = { { .vendor = PCI_VENDOR_ID_S3, .device = PCI_DEVICE_ID_S3_SAVAGE4, diff -Nru a/drivers/ide/pci/aec62xx.c b/drivers/ide/pci/aec62xx.c --- a/drivers/ide/pci/aec62xx.c Fri Aug 1 12:18:18 2003 +++ b/drivers/ide/pci/aec62xx.c Fri Aug 1 12:18:18 2003 @@ -533,7 +533,7 @@ return 0; } -static struct pci_device_id aec62xx_pci_tbl[] __devinitdata = { +static struct pci_device_id aec62xx_pci_tbl[] = { { PCI_VENDOR_ID_ARTOP, PCI_DEVICE_ID_ARTOP_ATP850UF, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 }, { PCI_VENDOR_ID_ARTOP, PCI_DEVICE_ID_ARTOP_ATP860, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 1 }, { PCI_VENDOR_ID_ARTOP, PCI_DEVICE_ID_ARTOP_ATP860R, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 2 }, diff -Nru a/drivers/ide/pci/alim15x3.c b/drivers/ide/pci/alim15x3.c --- a/drivers/ide/pci/alim15x3.c Fri Aug 1 12:18:18 2003 +++ b/drivers/ide/pci/alim15x3.c Fri Aug 1 12:18:18 2003 @@ -872,7 +872,7 @@ } -static struct pci_device_id alim15x3_pci_tbl[] __devinitdata = { +static struct pci_device_id alim15x3_pci_tbl[] = { { PCI_VENDOR_ID_AL, PCI_DEVICE_ID_AL_M5229, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 }, { 0, }, }; diff -Nru a/drivers/ide/pci/amd74xx.c b/drivers/ide/pci/amd74xx.c --- a/drivers/ide/pci/amd74xx.c Fri Aug 1 12:18:18 2003 +++ b/drivers/ide/pci/amd74xx.c Fri Aug 1 12:18:18 2003 @@ -440,7 +440,7 @@ return 0; } -static struct pci_device_id amd74xx_pci_tbl[] __devinitdata = { +static struct pci_device_id amd74xx_pci_tbl[] = { { PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_COBRA_7401, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, { PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_VIPER_7409, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 1}, { PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_VIPER_7411, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 2}, diff -Nru a/drivers/ide/pci/cmd64x.c b/drivers/ide/pci/cmd64x.c --- a/drivers/ide/pci/cmd64x.c Fri Aug 1 12:18:18 2003 +++ b/drivers/ide/pci/cmd64x.c Fri Aug 1 12:18:18 2003 @@ -763,7 +763,7 @@ return 0; } -static struct pci_device_id cmd64x_pci_tbl[] __devinitdata = { +static struct pci_device_id cmd64x_pci_tbl[] = { { PCI_VENDOR_ID_CMD, PCI_DEVICE_ID_CMD_643, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, { PCI_VENDOR_ID_CMD, PCI_DEVICE_ID_CMD_646, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 1}, { PCI_VENDOR_ID_CMD, PCI_DEVICE_ID_CMD_648, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 2}, diff -Nru a/drivers/ide/pci/cs5520.c b/drivers/ide/pci/cs5520.c --- a/drivers/ide/pci/cs5520.c Fri Aug 1 12:18:18 2003 +++ b/drivers/ide/pci/cs5520.c Fri Aug 1 12:18:18 2003 @@ -296,7 +296,7 @@ return 0; } -static struct pci_device_id cs5520_pci_tbl[] __devinitdata = { +static struct pci_device_id cs5520_pci_tbl[] = { { PCI_VENDOR_ID_CYRIX, PCI_DEVICE_ID_CYRIX_5510, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, { PCI_VENDOR_ID_CYRIX, PCI_DEVICE_ID_CYRIX_5520, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 1}, { 0, }, diff -Nru a/drivers/ide/pci/cs5530.c b/drivers/ide/pci/cs5530.c --- a/drivers/ide/pci/cs5530.c Fri Aug 1 12:18:18 2003 +++ b/drivers/ide/pci/cs5530.c Fri Aug 1 12:18:18 2003 @@ -431,7 +431,7 @@ return 0; } -static struct pci_device_id cs5530_pci_tbl[] __devinitdata = { +static struct pci_device_id cs5530_pci_tbl[] = { { PCI_VENDOR_ID_CYRIX, PCI_DEVICE_ID_CYRIX_5530_IDE, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, { 0, }, }; diff -Nru a/drivers/ide/pci/cy82c693.c b/drivers/ide/pci/cy82c693.c --- a/drivers/ide/pci/cy82c693.c Fri Aug 1 12:18:18 2003 +++ b/drivers/ide/pci/cy82c693.c Fri Aug 1 12:18:18 2003 @@ -439,7 +439,7 @@ return 0; } -static struct pci_device_id cy82c693_pci_tbl[] __devinitdata = { +static struct pci_device_id cy82c693_pci_tbl[] = { { PCI_VENDOR_ID_CONTAQ, PCI_DEVICE_ID_CONTAQ_82C693, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, { 0, }, }; diff -Nru a/drivers/ide/pci/generic.c b/drivers/ide/pci/generic.c --- a/drivers/ide/pci/generic.c Fri Aug 1 12:18:18 2003 +++ b/drivers/ide/pci/generic.c Fri Aug 1 12:18:18 2003 @@ -130,7 +130,7 @@ return 0; } -static struct pci_device_id generic_pci_tbl[] __devinitdata = { +static struct pci_device_id generic_pci_tbl[] = { { PCI_VENDOR_ID_NS, PCI_DEVICE_ID_NS_87410, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, { PCI_VENDOR_ID_PCTECH, PCI_DEVICE_ID_PCTECH_SAMURAI_IDE, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 1}, { PCI_VENDOR_ID_HOLTEK, PCI_DEVICE_ID_HOLTEK_6565, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 2}, diff -Nru a/drivers/ide/pci/hpt34x.c b/drivers/ide/pci/hpt34x.c --- a/drivers/ide/pci/hpt34x.c Fri Aug 1 12:18:18 2003 +++ b/drivers/ide/pci/hpt34x.c Fri Aug 1 12:18:18 2003 @@ -339,7 +339,7 @@ return 0; } -static struct pci_device_id hpt34x_pci_tbl[] __devinitdata = { +static struct pci_device_id hpt34x_pci_tbl[] = { { PCI_VENDOR_ID_TTI, PCI_DEVICE_ID_TTI_HPT343, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, { 0, }, }; diff -Nru a/drivers/ide/pci/hpt366.c b/drivers/ide/pci/hpt366.c --- a/drivers/ide/pci/hpt366.c Fri Aug 1 12:18:18 2003 +++ b/drivers/ide/pci/hpt366.c Fri Aug 1 12:18:18 2003 @@ -1190,7 +1190,7 @@ return 0; } -static struct pci_device_id hpt366_pci_tbl[] __devinitdata = { +static struct pci_device_id hpt366_pci_tbl[] = { { PCI_VENDOR_ID_TTI, PCI_DEVICE_ID_TTI_HPT366, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, { PCI_VENDOR_ID_TTI, PCI_DEVICE_ID_TTI_HPT372, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 1}, { PCI_VENDOR_ID_TTI, PCI_DEVICE_ID_TTI_HPT302, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 2}, diff -Nru a/drivers/ide/pci/it8172.c b/drivers/ide/pci/it8172.c --- a/drivers/ide/pci/it8172.c Fri Aug 1 12:18:18 2003 +++ b/drivers/ide/pci/it8172.c Fri Aug 1 12:18:18 2003 @@ -303,7 +303,7 @@ return 0; } -static struct pci_device_id it8172_pci_tbl[] __devinitdata = { +static struct pci_device_id it8172_pci_tbl[] = { { PCI_VENDOR_ID_ITE, PCI_DEVICE_ID_ITE_IT8172G, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, { 0, }, }; diff -Nru a/drivers/ide/pci/ns87415.c b/drivers/ide/pci/ns87415.c --- a/drivers/ide/pci/ns87415.c Fri Aug 1 12:18:18 2003 +++ b/drivers/ide/pci/ns87415.c Fri Aug 1 12:18:18 2003 @@ -236,7 +236,7 @@ return 0; } -static struct pci_device_id ns87415_pci_tbl[] __devinitdata = { +static struct pci_device_id ns87415_pci_tbl[] = { { PCI_VENDOR_ID_NS, PCI_DEVICE_ID_NS_87415, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, { 0, }, }; diff -Nru a/drivers/ide/pci/opti621.c b/drivers/ide/pci/opti621.c --- a/drivers/ide/pci/opti621.c Fri Aug 1 12:18:18 2003 +++ b/drivers/ide/pci/opti621.c Fri Aug 1 12:18:18 2003 @@ -371,7 +371,7 @@ return 0; } -static struct pci_device_id opti621_pci_tbl[] __devinitdata = { +static struct pci_device_id opti621_pci_tbl[] = { { PCI_VENDOR_ID_OPTI, PCI_DEVICE_ID_OPTI_82C621, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, { PCI_VENDOR_ID_OPTI, PCI_DEVICE_ID_OPTI_82C825, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 1}, { 0, }, diff -Nru a/drivers/ide/pci/pdc202xx_new.c b/drivers/ide/pci/pdc202xx_new.c --- a/drivers/ide/pci/pdc202xx_new.c Fri Aug 1 12:18:18 2003 +++ b/drivers/ide/pci/pdc202xx_new.c Fri Aug 1 12:18:18 2003 @@ -636,7 +636,7 @@ return 0; } -static struct pci_device_id pdc202new_pci_tbl[] __devinitdata = { +static struct pci_device_id pdc202new_pci_tbl[] = { { PCI_VENDOR_ID_PROMISE, PCI_DEVICE_ID_PROMISE_20268, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, { PCI_VENDOR_ID_PROMISE, PCI_DEVICE_ID_PROMISE_20269, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 1}, { PCI_VENDOR_ID_PROMISE, PCI_DEVICE_ID_PROMISE_20270, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 2}, diff -Nru a/drivers/ide/pci/pdc202xx_old.c b/drivers/ide/pci/pdc202xx_old.c --- a/drivers/ide/pci/pdc202xx_old.c Fri Aug 1 12:18:18 2003 +++ b/drivers/ide/pci/pdc202xx_old.c Fri Aug 1 12:18:18 2003 @@ -928,7 +928,7 @@ return 0; } -static struct pci_device_id pdc202xx_pci_tbl[] __devinitdata = { +static struct pci_device_id pdc202xx_pci_tbl[] = { { PCI_VENDOR_ID_PROMISE, PCI_DEVICE_ID_PROMISE_20246, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, { PCI_VENDOR_ID_PROMISE, PCI_DEVICE_ID_PROMISE_20262, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 1}, { PCI_VENDOR_ID_PROMISE, PCI_DEVICE_ID_PROMISE_20263, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 2}, diff -Nru a/drivers/ide/pci/pdcadma.c b/drivers/ide/pci/pdcadma.c --- a/drivers/ide/pci/pdcadma.c Fri Aug 1 12:18:18 2003 +++ b/drivers/ide/pci/pdcadma.c Fri Aug 1 12:18:18 2003 @@ -134,7 +134,7 @@ return 1; } -static struct pci_device_id pdcadma_pci_tbl[] __devinitdata = { +static struct pci_device_id pdcadma_pci_tbl[] = { { PCI_VENDOR_ID_PDC, PCI_DEVICE_ID_PDC_1841, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, { 0, }, }; diff -Nru a/drivers/ide/pci/piix.c b/drivers/ide/pci/piix.c --- a/drivers/ide/pci/piix.c Fri Aug 1 12:18:18 2003 +++ b/drivers/ide/pci/piix.c Fri Aug 1 12:18:18 2003 @@ -792,7 +792,7 @@ printk(KERN_WARNING "piix: A BIOS update may resolve this.\n"); } -static struct pci_device_id piix_pci_tbl[] __devinitdata = { +static struct pci_device_id piix_pci_tbl[] = { { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82371FB_0, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82371FB_1, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 1}, { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82371MX, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 2}, diff -Nru a/drivers/ide/pci/rz1000.c b/drivers/ide/pci/rz1000.c --- a/drivers/ide/pci/rz1000.c Fri Aug 1 12:18:18 2003 +++ b/drivers/ide/pci/rz1000.c Fri Aug 1 12:18:18 2003 @@ -66,7 +66,7 @@ return 0; } -static struct pci_device_id rz1000_pci_tbl[] __devinitdata = { +static struct pci_device_id rz1000_pci_tbl[] = { { PCI_VENDOR_ID_PCTECH, PCI_DEVICE_ID_PCTECH_RZ1000, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, { PCI_VENDOR_ID_PCTECH, PCI_DEVICE_ID_PCTECH_RZ1001, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 1}, { 0, }, diff -Nru a/drivers/ide/pci/sc1200.c b/drivers/ide/pci/sc1200.c --- a/drivers/ide/pci/sc1200.c Fri Aug 1 12:18:18 2003 +++ b/drivers/ide/pci/sc1200.c Fri Aug 1 12:18:18 2003 @@ -564,7 +564,7 @@ return 0; } -static struct pci_device_id sc1200_pci_tbl[] __devinitdata = { +static struct pci_device_id sc1200_pci_tbl[] = { { PCI_VENDOR_ID_NS, PCI_DEVICE_ID_NS_SCx200_IDE, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, { 0, }, }; diff -Nru a/drivers/ide/pci/serverworks.c b/drivers/ide/pci/serverworks.c --- a/drivers/ide/pci/serverworks.c Fri Aug 1 12:18:18 2003 +++ b/drivers/ide/pci/serverworks.c Fri Aug 1 12:18:18 2003 @@ -799,7 +799,7 @@ return 0; } -static struct pci_device_id svwks_pci_tbl[] __devinitdata = { +static struct pci_device_id svwks_pci_tbl[] = { { PCI_VENDOR_ID_SERVERWORKS, PCI_DEVICE_ID_SERVERWORKS_OSB4IDE, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, { PCI_VENDOR_ID_SERVERWORKS, PCI_DEVICE_ID_SERVERWORKS_CSB5IDE, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 1}, { PCI_VENDOR_ID_SERVERWORKS, PCI_DEVICE_ID_SERVERWORKS_CSB6IDE, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 2}, diff -Nru a/drivers/ide/pci/siimage.c b/drivers/ide/pci/siimage.c --- a/drivers/ide/pci/siimage.c Fri Aug 1 12:18:18 2003 +++ b/drivers/ide/pci/siimage.c Fri Aug 1 12:18:18 2003 @@ -826,7 +826,7 @@ return 0; } -static struct pci_device_id siimage_pci_tbl[] __devinitdata = { +static struct pci_device_id siimage_pci_tbl[] = { { PCI_VENDOR_ID_CMD, PCI_DEVICE_ID_SII_680, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, { PCI_VENDOR_ID_CMD, PCI_DEVICE_ID_SII_3112, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 1}, { 0, }, diff -Nru a/drivers/ide/pci/sis5513.c b/drivers/ide/pci/sis5513.c --- a/drivers/ide/pci/sis5513.c Fri Aug 1 12:18:18 2003 +++ b/drivers/ide/pci/sis5513.c Fri Aug 1 12:18:18 2003 @@ -961,7 +961,7 @@ return 0; } -static struct pci_device_id sis5513_pci_tbl[] __devinitdata = { +static struct pci_device_id sis5513_pci_tbl[] = { { PCI_VENDOR_ID_SI, PCI_DEVICE_ID_SI_5513, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, { 0, }, }; diff -Nru a/drivers/ide/pci/sl82c105.c b/drivers/ide/pci/sl82c105.c --- a/drivers/ide/pci/sl82c105.c Fri Aug 1 12:18:18 2003 +++ b/drivers/ide/pci/sl82c105.c Fri Aug 1 12:18:18 2003 @@ -511,7 +511,7 @@ return 0; } -static struct pci_device_id sl82c105_pci_tbl[] __devinitdata = { +static struct pci_device_id sl82c105_pci_tbl[] = { { PCI_VENDOR_ID_WINBOND, PCI_DEVICE_ID_WINBOND_82C105, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, { 0, }, }; diff -Nru a/drivers/ide/pci/slc90e66.c b/drivers/ide/pci/slc90e66.c --- a/drivers/ide/pci/slc90e66.c Fri Aug 1 12:18:18 2003 +++ b/drivers/ide/pci/slc90e66.c Fri Aug 1 12:18:18 2003 @@ -381,7 +381,7 @@ return 0; } -static struct pci_device_id slc90e66_pci_tbl[] __devinitdata = { +static struct pci_device_id slc90e66_pci_tbl[] = { { PCI_VENDOR_ID_EFAR, PCI_DEVICE_ID_EFAR_SLC90E66_1, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, { 0, }, }; diff -Nru a/drivers/ide/pci/triflex.h b/drivers/ide/pci/triflex.h --- a/drivers/ide/pci/triflex.h Fri Aug 1 12:18:18 2003 +++ b/drivers/ide/pci/triflex.h Fri Aug 1 12:18:18 2003 @@ -41,7 +41,7 @@ }; #endif -static struct pci_device_id triflex_pci_tbl[] __devinitdata = { +static struct pci_device_id triflex_pci_tbl[] = { { PCI_VENDOR_ID_COMPAQ, PCI_DEVICE_ID_COMPAQ_TRIFLEX_IDE, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 }, { 0, }, diff -Nru a/drivers/ide/pci/trm290.c b/drivers/ide/pci/trm290.c --- a/drivers/ide/pci/trm290.c Fri Aug 1 12:18:18 2003 +++ b/drivers/ide/pci/trm290.c Fri Aug 1 12:18:18 2003 @@ -407,7 +407,7 @@ return 0; } -static struct pci_device_id trm290_pci_tbl[] __devinitdata = { +static struct pci_device_id trm290_pci_tbl[] = { { PCI_VENDOR_ID_TEKRAM, PCI_DEVICE_ID_TEKRAM_DC290, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, { 0, }, }; diff -Nru a/drivers/ide/pci/via82cxxx.c b/drivers/ide/pci/via82cxxx.c --- a/drivers/ide/pci/via82cxxx.c Fri Aug 1 12:18:18 2003 +++ b/drivers/ide/pci/via82cxxx.c Fri Aug 1 12:18:18 2003 @@ -638,7 +638,7 @@ return 0; } -static struct pci_device_id via_pci_tbl[] __devinitdata = { +static struct pci_device_id via_pci_tbl[] = { { PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_82C576_1, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, { PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_82C586_1, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 1}, { 0, }, diff -Nru a/drivers/ieee1394/ohci1394.c b/drivers/ieee1394/ohci1394.c --- a/drivers/ieee1394/ohci1394.c Fri Aug 1 12:18:18 2003 +++ b/drivers/ieee1394/ohci1394.c Fri Aug 1 12:18:18 2003 @@ -3571,7 +3571,7 @@ #define PCI_CLASS_FIREWIRE_OHCI ((PCI_CLASS_SERIAL_FIREWIRE << 8) | 0x10) -static struct pci_device_id ohci1394_pci_tbl[] __devinitdata = { +static struct pci_device_id ohci1394_pci_tbl[] = { { .class = PCI_CLASS_FIREWIRE_OHCI, .class_mask = PCI_ANY_ID, diff -Nru a/drivers/ieee1394/pcilynx.c b/drivers/ieee1394/pcilynx.c --- a/drivers/ieee1394/pcilynx.c Fri Aug 1 12:18:18 2003 +++ b/drivers/ieee1394/pcilynx.c Fri Aug 1 12:18:18 2003 @@ -1897,7 +1897,7 @@ return sizeof(lynx_csr_rom); } -static struct pci_device_id pci_table[] __devinitdata = { +static struct pci_device_id pci_table[] = { { .vendor = PCI_VENDOR_ID_TI, .device = PCI_DEVICE_ID_TI_PCILYNX, ^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH] PCI fixes for 2.6.0-test2 2003-08-01 19:32 ` Greg KH @ 2003-08-01 19:32 ` Greg KH 2003-08-01 19:32 ` Greg KH 0 siblings, 1 reply; 9+ messages in thread From: Greg KH @ 2003-08-01 19:32 UTC (permalink / raw) To: linux-kernel ChangeSet 1.1547.10.6, 2003/07/31 16:11:47-07:00, greg@kroah.com [PATCH] PCI: pci_device_id can not be marked __devinitdata. Fixes up drivers/input/* drivers/isdn/* drivers/media/* drivers/mtd/* drivers/parisc/* drivers/pci/* drivers/parport/* drivers/scsi/* and drivers/serial/* drivers/input/gameport/cs461x.c | 2 +- drivers/input/gameport/emu10k1-gp.c | 2 +- drivers/input/gameport/fm801-gp.c | 2 +- drivers/input/gameport/vortex.c | 2 +- drivers/isdn/hardware/avm/b1pci.c | 2 +- drivers/isdn/hardware/avm/c4.c | 2 +- drivers/isdn/hardware/avm/t1pci.c | 2 +- drivers/isdn/hardware/eicon/divasmain.c | 2 +- drivers/isdn/hisax/hisax_fcpcipnp.c | 2 +- drivers/isdn/hisax/hisax_hfcpci.c | 2 +- drivers/isdn/tpam/tpam_main.c | 2 +- drivers/media/radio/radio-maxiradio.c | 2 +- drivers/media/video/bttv-driver.c | 2 +- drivers/media/video/meye.c | 2 +- drivers/mtd/maps/amd76xrom.c | 2 +- drivers/mtd/maps/ich2rom.c | 2 +- drivers/mtd/maps/pci.c | 2 +- drivers/mtd/maps/scb2_flash.c | 2 +- drivers/parisc/eisa.c | 2 +- drivers/parisc/superio.c | 2 +- drivers/parport/parport_pc.c | 2 +- drivers/parport/parport_serial.c | 2 +- drivers/pci/hotplug/cpcihp_zt5550.c | 5 ++--- drivers/pci/hotplug/cpqphp_core.c | 2 +- drivers/pci/hotplug/ibmphp_ebda.c | 2 +- drivers/pcmcia/yenta_socket.c | 2 +- drivers/scsi/dc395x.c | 2 +- drivers/scsi/gdth.c | 2 +- drivers/scsi/ips.c | 2 +- drivers/scsi/nsp32.c | 2 +- drivers/scsi/tmscsim.c | 2 +- drivers/serial/8250_pci.c | 2 +- 32 files changed, 33 insertions(+), 34 deletions(-) diff -Nru a/drivers/input/gameport/cs461x.c b/drivers/input/gameport/cs461x.c --- a/drivers/input/gameport/cs461x.c Fri Aug 1 12:18:06 2003 +++ b/drivers/input/gameport/cs461x.c Fri Aug 1 12:18:06 2003 @@ -216,7 +216,7 @@ return 0; } -static struct pci_device_id cs461x_pci_tbl[] __devinitdata = { +static struct pci_device_id cs461x_pci_tbl[] = { { PCI_VENDOR_ID_CIRRUS, 0x6001, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 }, /* Cirrus CS4610 */ { PCI_VENDOR_ID_CIRRUS, 0x6003, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 }, /* Cirrus CS4612 */ { PCI_VENDOR_ID_CIRRUS, 0x6005, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 }, /* Cirrus CS4615 */ diff -Nru a/drivers/input/gameport/emu10k1-gp.c b/drivers/input/gameport/emu10k1-gp.c --- a/drivers/input/gameport/emu10k1-gp.c Fri Aug 1 12:18:06 2003 +++ b/drivers/input/gameport/emu10k1-gp.c Fri Aug 1 12:18:06 2003 @@ -49,7 +49,7 @@ char phys[32]; }; -static struct pci_device_id emu_tbl[] __devinitdata = { +static struct pci_device_id emu_tbl[] = { { 0x1102, 0x7002, PCI_ANY_ID, PCI_ANY_ID }, /* SB Live gameport */ { 0x1102, 0x7003, PCI_ANY_ID, PCI_ANY_ID }, /* Audigy gameport */ { 0, } diff -Nru a/drivers/input/gameport/fm801-gp.c b/drivers/input/gameport/fm801-gp.c --- a/drivers/input/gameport/fm801-gp.c Fri Aug 1 12:18:06 2003 +++ b/drivers/input/gameport/fm801-gp.c Fri Aug 1 12:18:06 2003 @@ -131,7 +131,7 @@ } } -static struct pci_device_id fm801_gp_id_table[] __devinitdata = { +static struct pci_device_id fm801_gp_id_table[] = { { PCI_VENDOR_ID_FORTEMEDIA, PCI_DEVICE_ID_FM801_GP, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 }, { 0 } }; diff -Nru a/drivers/input/gameport/vortex.c b/drivers/input/gameport/vortex.c --- a/drivers/input/gameport/vortex.c Fri Aug 1 12:18:06 2003 +++ b/drivers/input/gameport/vortex.c Fri Aug 1 12:18:06 2003 @@ -159,7 +159,7 @@ kfree(vortex); } -static struct pci_device_id vortex_id_table[] __devinitdata = +static struct pci_device_id vortex_id_table[] = {{ 0x12eb, 0x0001, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0x11000 }, { 0x12eb, 0x0002, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0x28800 }, { 0 }}; diff -Nru a/drivers/isdn/hardware/avm/b1pci.c b/drivers/isdn/hardware/avm/b1pci.c --- a/drivers/isdn/hardware/avm/b1pci.c Fri Aug 1 12:18:06 2003 +++ b/drivers/isdn/hardware/avm/b1pci.c Fri Aug 1 12:18:06 2003 @@ -28,7 +28,7 @@ /* ------------------------------------------------------------- */ -static struct pci_device_id b1pci_pci_tbl[] __devinitdata = { +static struct pci_device_id b1pci_pci_tbl[] = { { PCI_VENDOR_ID_AVM, PCI_DEVICE_ID_AVM_B1, PCI_ANY_ID, PCI_ANY_ID }, { } /* Terminating entry */ }; diff -Nru a/drivers/isdn/hardware/avm/c4.c b/drivers/isdn/hardware/avm/c4.c --- a/drivers/isdn/hardware/avm/c4.c Fri Aug 1 12:18:06 2003 +++ b/drivers/isdn/hardware/avm/c4.c Fri Aug 1 12:18:06 2003 @@ -36,7 +36,7 @@ static int suppress_pollack; -static struct pci_device_id c4_pci_tbl[] __devinitdata = { +static struct pci_device_id c4_pci_tbl[] = { { PCI_VENDOR_ID_DEC, PCI_DEVICE_ID_DEC_21285, PCI_VENDOR_ID_AVM, PCI_DEVICE_ID_AVM_C4, 4 }, { PCI_VENDOR_ID_DEC, PCI_DEVICE_ID_DEC_21285, PCI_VENDOR_ID_AVM, PCI_DEVICE_ID_AVM_C2, 2 }, { } /* Terminating entry */ diff -Nru a/drivers/isdn/hardware/avm/t1pci.c b/drivers/isdn/hardware/avm/t1pci.c --- a/drivers/isdn/hardware/avm/t1pci.c Fri Aug 1 12:18:06 2003 +++ b/drivers/isdn/hardware/avm/t1pci.c Fri Aug 1 12:18:06 2003 @@ -31,7 +31,7 @@ /* ------------------------------------------------------------- */ -static struct pci_device_id t1pci_pci_tbl[] __devinitdata = { +static struct pci_device_id t1pci_pci_tbl[] = { { PCI_VENDOR_ID_AVM, PCI_DEVICE_ID_AVM_T1, PCI_ANY_ID, PCI_ANY_ID }, { } /* Terminating entry */ }; diff -Nru a/drivers/isdn/hardware/eicon/divasmain.c b/drivers/isdn/hardware/eicon/divasmain.c --- a/drivers/isdn/hardware/eicon/divasmain.c Fri Aug 1 12:18:06 2003 +++ b/drivers/isdn/hardware/eicon/divasmain.c Fri Aug 1 12:18:06 2003 @@ -119,7 +119,7 @@ /* This table should be sorted by PCI device ID */ -static struct pci_device_id divas_pci_tbl[] __devinitdata = { +static struct pci_device_id divas_pci_tbl[] = { /* Diva Server BRI-2M PCI 0xE010 */ {PCI_VENDOR_ID_EICON, PCI_DEVICE_ID_EICON_MAESTRA, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CARDTYPE_MAESTRA_PCI}, diff -Nru a/drivers/isdn/hisax/hisax_fcpcipnp.c b/drivers/isdn/hisax/hisax_fcpcipnp.c --- a/drivers/isdn/hisax/hisax_fcpcipnp.c Fri Aug 1 12:18:06 2003 +++ b/drivers/isdn/hisax/hisax_fcpcipnp.c Fri Aug 1 12:18:06 2003 @@ -46,7 +46,7 @@ MODULE_AUTHOR("Kai Germaschewski <kai.germaschewski@gmx.de>/Karsten Keil <kkeil@suse.de>"); MODULE_DESCRIPTION("AVM Fritz!PCI/PnP ISDN driver"); -static struct pci_device_id fcpci_ids[] __devinitdata = { +static struct pci_device_id fcpci_ids[] = { { .vendor = PCI_VENDOR_ID_AVM, .device = PCI_DEVICE_ID_AVM_A1, .subvendor = PCI_ANY_ID, diff -Nru a/drivers/isdn/hisax/hisax_hfcpci.c b/drivers/isdn/hisax/hisax_hfcpci.c --- a/drivers/isdn/hisax/hisax_hfcpci.c Fri Aug 1 12:18:06 2003 +++ b/drivers/isdn/hisax/hisax_hfcpci.c Fri Aug 1 12:18:06 2003 @@ -47,7 +47,7 @@ .class_mask = 0, \ .driver_data = (unsigned long) name } -static struct pci_device_id hfcpci_ids[] __devinitdata = { +static struct pci_device_id hfcpci_ids[] = { ID(CCD, CCD_2BD0, "CCD/Billion/Asuscom 2BD0"), ID(CCD, CCD_B000, "Billion B000"), ID(CCD, CCD_B006, "Billion B006"), diff -Nru a/drivers/isdn/tpam/tpam_main.c b/drivers/isdn/tpam/tpam_main.c --- a/drivers/isdn/tpam/tpam_main.c Fri Aug 1 12:18:06 2003 +++ b/drivers/isdn/tpam/tpam_main.c Fri Aug 1 12:18:06 2003 @@ -241,7 +241,7 @@ kfree(card); } -static struct pci_device_id tpam_pci_tbl[] __devinitdata = { +static struct pci_device_id tpam_pci_tbl[] = { { PCI_VENDOR_ID_XILINX, PCI_DEVICE_ID_TURBOPAM, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 }, { } diff -Nru a/drivers/media/radio/radio-maxiradio.c b/drivers/media/radio/radio-maxiradio.c --- a/drivers/media/radio/radio-maxiradio.c Fri Aug 1 12:18:06 2003 +++ b/drivers/media/radio/radio-maxiradio.c Fri Aug 1 12:18:06 2003 @@ -327,7 +327,7 @@ release_region(pci_resource_start(pdev, 0), pci_resource_len(pdev, 0)); } -static struct pci_device_id maxiradio_pci_tbl[] __devinitdata = { +static struct pci_device_id maxiradio_pci_tbl[] = { { PCI_VENDOR_ID_GUILLEMOT, PCI_DEVICE_ID_GUILLEMOT_MAXIRADIO, PCI_ANY_ID, PCI_ANY_ID, }, { 0,} diff -Nru a/drivers/media/video/bttv-driver.c b/drivers/media/video/bttv-driver.c --- a/drivers/media/video/bttv-driver.c Fri Aug 1 12:18:06 2003 +++ b/drivers/media/video/bttv-driver.c Fri Aug 1 12:18:06 2003 @@ -3496,7 +3496,7 @@ return; } -static struct pci_device_id bttv_pci_tbl[] __devinitdata = { +static struct pci_device_id bttv_pci_tbl[] = { {PCI_VENDOR_ID_BROOKTREE, PCI_DEVICE_ID_BT848, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, {PCI_VENDOR_ID_BROOKTREE, PCI_DEVICE_ID_BT849, diff -Nru a/drivers/media/video/meye.c b/drivers/media/video/meye.c --- a/drivers/media/video/meye.c Fri Aug 1 12:18:06 2003 +++ b/drivers/media/video/meye.c Fri Aug 1 12:18:06 2003 @@ -1416,7 +1416,7 @@ printk(KERN_INFO "meye: removed\n"); } -static struct pci_device_id meye_pci_tbl[] __devinitdata = { +static struct pci_device_id meye_pci_tbl[] = { { PCI_VENDOR_ID_KAWASAKI, PCI_DEVICE_ID_MCHIP_KL5A72002, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 }, { } diff -Nru a/drivers/mtd/maps/amd76xrom.c b/drivers/mtd/maps/amd76xrom.c --- a/drivers/mtd/maps/amd76xrom.c Fri Aug 1 12:18:06 2003 +++ b/drivers/mtd/maps/amd76xrom.c Fri Aug 1 12:18:06 2003 @@ -160,7 +160,7 @@ #endif /* REQUEST_MEM_REGION */ } -static struct pci_device_id amd76xrom_pci_tbl[] __devinitdata = { +static struct pci_device_id amd76xrom_pci_tbl[] = { { PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_VIPER_7410, PCI_ANY_ID, PCI_ANY_ID, }, { PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_VIPER_7440, diff -Nru a/drivers/mtd/maps/ich2rom.c b/drivers/mtd/maps/ich2rom.c --- a/drivers/mtd/maps/ich2rom.c Fri Aug 1 12:18:06 2003 +++ b/drivers/mtd/maps/ich2rom.c Fri Aug 1 12:18:06 2003 @@ -260,7 +260,7 @@ #endif } -static struct pci_device_id ich2rom_pci_tbl[] __devinitdata = { +static struct pci_device_id ich2rom_pci_tbl[] = { { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801BA_0, PCI_ANY_ID, PCI_ANY_ID, }, { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801CA_0, diff -Nru a/drivers/mtd/maps/pci.c b/drivers/mtd/maps/pci.c --- a/drivers/mtd/maps/pci.c Fri Aug 1 12:18:06 2003 +++ b/drivers/mtd/maps/pci.c Fri Aug 1 12:18:06 2003 @@ -191,7 +191,7 @@ * PCI device ID table */ -static struct pci_device_id mtd_pci_ids[] __devinitdata = { +static struct pci_device_id mtd_pci_ids[] = { { .vendor = PCI_VENDOR_ID_INTEL, .device = 0x530d, diff -Nru a/drivers/mtd/maps/scb2_flash.c b/drivers/mtd/maps/scb2_flash.c --- a/drivers/mtd/maps/scb2_flash.c Fri Aug 1 12:18:06 2003 +++ b/drivers/mtd/maps/scb2_flash.c Fri Aug 1 12:18:06 2003 @@ -218,7 +218,7 @@ pci_set_drvdata(dev, NULL); } -static struct pci_device_id scb2_flash_pci_ids[] __devinitdata = { +static struct pci_device_id scb2_flash_pci_ids[] = { { .vendor = PCI_VENDOR_ID_SERVERWORKS, .device = PCI_DEVICE_ID_SERVERWORKS_CSB5, diff -Nru a/drivers/parisc/eisa.c b/drivers/parisc/eisa.c --- a/drivers/parisc/eisa.c Fri Aug 1 12:18:06 2003 +++ b/drivers/parisc/eisa.c Fri Aug 1 12:18:06 2003 @@ -398,7 +398,7 @@ return 0; } -static struct parisc_device_id __devinitdata eisa_tbl[] = { +static struct parisc_device_id eisa_tbl[] = { { HPHW_BA, HVERSION_REV_ANY_ID, HVERSION_ANY_ID, 0x00076 }, /* Mongoose */ { HPHW_BA, HVERSION_REV_ANY_ID, HVERSION_ANY_ID, 0x00090 }, /* Wax EISA */ { 0, } diff -Nru a/drivers/parisc/superio.c b/drivers/parisc/superio.c --- a/drivers/parisc/superio.c Fri Aug 1 12:18:06 2003 +++ b/drivers/parisc/superio.c Fri Aug 1 12:18:06 2003 @@ -517,7 +517,7 @@ } } -static struct pci_device_id superio_tbl[] __devinitdata = { +static struct pci_device_id superio_tbl[] = { { PCI_VENDOR_ID_NS, PCI_ANY_ID, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 }, { 0, } }; diff -Nru a/drivers/parport/parport_pc.c b/drivers/parport/parport_pc.c --- a/drivers/parport/parport_pc.c Fri Aug 1 12:18:06 2003 +++ b/drivers/parport/parport_pc.c Fri Aug 1 12:18:06 2003 @@ -2825,7 +2825,7 @@ /* mobility_pp */ { 1, { { 0, 1 }, } }, }; -static struct pci_device_id parport_pc_pci_tbl[] __devinitdata = { +static struct pci_device_id parport_pc_pci_tbl[] = { /* Super-IO onboard chips */ { 0x1106, 0x0686, PCI_ANY_ID, PCI_ANY_ID, 0, 0, sio_via_686a }, { PCI_VENDOR_ID_ITE, PCI_DEVICE_ID_ITE_8872, diff -Nru a/drivers/parport/parport_serial.c b/drivers/parport/parport_serial.c --- a/drivers/parport/parport_serial.c Fri Aug 1 12:18:06 2003 +++ b/drivers/parport/parport_serial.c Fri Aug 1 12:18:06 2003 @@ -87,7 +87,7 @@ /* siig_2s1p_20x */ { 1, { { 2, 3 }, } }, }; -static struct pci_device_id parport_serial_pci_tbl[] __devinitdata = { +static struct pci_device_id parport_serial_pci_tbl[] = { /* PCI cards */ { PCI_VENDOR_ID_TITAN, PCI_DEVICE_ID_TITAN_110L, PCI_ANY_ID, PCI_ANY_ID, 0, 0, titan_110l }, diff -Nru a/drivers/pci/hotplug/cpcihp_zt5550.c b/drivers/pci/hotplug/cpcihp_zt5550.c --- a/drivers/pci/hotplug/cpcihp_zt5550.c Fri Aug 1 12:18:06 2003 +++ b/drivers/pci/hotplug/cpcihp_zt5550.c Fri Aug 1 12:18:06 2003 @@ -187,8 +187,7 @@ return 0; } -static int __devinit zt5550_hc_init_one (struct pci_dev *pdev, - const struct pci_device_id *ent) +static int zt5550_hc_init_one (struct pci_dev *pdev, const struct pci_device_id *ent) { int status; @@ -262,7 +261,7 @@ } -static struct pci_device_id zt5550_hc_pci_tbl[] __devinitdata = { +static struct pci_device_id zt5550_hc_pci_tbl[] = { { PCI_VENDOR_ID_ZIATECH, PCI_DEVICE_ID_ZIATECH_5550_HC, PCI_ANY_ID, PCI_ANY_ID, }, { 0, } }; diff -Nru a/drivers/pci/hotplug/cpqphp_core.c b/drivers/pci/hotplug/cpqphp_core.c --- a/drivers/pci/hotplug/cpqphp_core.c Fri Aug 1 12:18:06 2003 +++ b/drivers/pci/hotplug/cpqphp_core.c Fri Aug 1 12:18:06 2003 @@ -1488,7 +1488,7 @@ -static struct pci_device_id hpcd_pci_tbl[] __devinitdata = { +static struct pci_device_id hpcd_pci_tbl[] = { { /* handle any PCI Hotplug controller */ .class = ((PCI_CLASS_SYSTEM_PCI_HOTPLUG << 8) | 0x00), diff -Nru a/drivers/pci/hotplug/ibmphp_ebda.c b/drivers/pci/hotplug/ibmphp_ebda.c --- a/drivers/pci/hotplug/ibmphp_ebda.c Fri Aug 1 12:18:06 2003 +++ b/drivers/pci/hotplug/ibmphp_ebda.c Fri Aug 1 12:18:06 2003 @@ -1230,7 +1230,7 @@ } } -static struct pci_device_id id_table[] __devinitdata = { +static struct pci_device_id id_table[] = { { .vendor = PCI_VENDOR_ID_IBM, .device = HPC_DEVICE_ID, diff -Nru a/drivers/pcmcia/yenta_socket.c b/drivers/pcmcia/yenta_socket.c --- a/drivers/pcmcia/yenta_socket.c Fri Aug 1 12:18:06 2003 +++ b/drivers/pcmcia/yenta_socket.c Fri Aug 1 12:18:06 2003 @@ -911,7 +911,7 @@ } -static struct pci_device_id yenta_table [] __devinitdata = { { +static struct pci_device_id yenta_table [] = { { .class = PCI_CLASS_BRIDGE_CARDBUS << 8, .class_mask = ~0, diff -Nru a/drivers/scsi/dc395x.c b/drivers/scsi/dc395x.c --- a/drivers/scsi/dc395x.c Fri Aug 1 12:18:06 2003 +++ b/drivers/scsi/dc395x.c Fri Aug 1 12:18:06 2003 @@ -6237,7 +6237,7 @@ * Table which identifies the PCI devices which * are handled by this device driver. */ -static struct pci_device_id dc395x_pci_table[] __devinitdata = { +static struct pci_device_id dc395x_pci_table[] = { { .vendor = PCI_VENDOR_ID_TEKRAM, .device = PCI_DEVICE_ID_TEKRAM_TRMS1040, diff -Nru a/drivers/scsi/gdth.c b/drivers/scsi/gdth.c --- a/drivers/scsi/gdth.c Fri Aug 1 12:18:06 2003 +++ b/drivers/scsi/gdth.c Fri Aug 1 12:18:06 2003 @@ -862,7 +862,7 @@ /* Vortex only makes RAID controllers. * We do not really want to specify all 550 ids here, so wildcard match. */ -static struct pci_device_id gdthtable[] __devinitdata = { +static struct pci_device_id gdthtable[] = { {PCI_VENDOR_ID_VORTEX,PCI_ANY_ID,PCI_ANY_ID, PCI_ANY_ID}, {PCI_VENDOR_ID_INTEL,PCI_DEVICE_ID_INTEL_SRC,PCI_ANY_ID,PCI_ANY_ID}, {PCI_VENDOR_ID_INTEL,PCI_DEVICE_ID_INTEL_SRC_XSCALE,PCI_ANY_ID,PCI_ANY_ID}, diff -Nru a/drivers/scsi/ips.c b/drivers/scsi/ips.c --- a/drivers/scsi/ips.c Fri Aug 1 12:18:06 2003 +++ b/drivers/scsi/ips.c Fri Aug 1 12:18:06 2003 @@ -280,7 +280,7 @@ /* This table describes all ServeRAID Adapters */ - static struct pci_device_id ips_pci_table[] __devinitdata = { + static struct pci_device_id ips_pci_table[] = { { 0x1014, 0x002E, PCI_ANY_ID, PCI_ANY_ID, 0, 0 }, { 0x1014, 0x01BD, PCI_ANY_ID, PCI_ANY_ID, 0, 0 }, { 0x9005, 0x0250, PCI_ANY_ID, PCI_ANY_ID, 0, 0 }, diff -Nru a/drivers/scsi/nsp32.c b/drivers/scsi/nsp32.c --- a/drivers/scsi/nsp32.c Fri Aug 1 12:18:06 2003 +++ b/drivers/scsi/nsp32.c Fri Aug 1 12:18:06 2003 @@ -2001,7 +2001,7 @@ iounmap((void *)(data->MmioAddress)); } -static struct pci_device_id nsp32_pci_table[] __devinitdata = { +static struct pci_device_id nsp32_pci_table[] = { { .vendor = PCI_VENDOR_ID_IODATA, .device = PCI_DEVICE_ID_NINJASCSI_32BI_CBSC_II, diff -Nru a/drivers/scsi/tmscsim.c b/drivers/scsi/tmscsim.c --- a/drivers/scsi/tmscsim.c Fri Aug 1 12:18:06 2003 +++ b/drivers/scsi/tmscsim.c Fri Aug 1 12:18:06 2003 @@ -274,7 +274,7 @@ #endif #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,3,99) -static struct pci_device_id tmscsim_pci_tbl[] __initdata = { +static struct pci_device_id tmscsim_pci_tbl[] = { { .vendor = PCI_VENDOR_ID_AMD, .device = PCI_DEVICE_ID_AMD53C974, diff -Nru a/drivers/serial/8250_pci.c b/drivers/serial/8250_pci.c --- a/drivers/serial/8250_pci.c Fri Aug 1 12:18:06 2003 +++ b/drivers/serial/8250_pci.c Fri Aug 1 12:18:06 2003 @@ -1647,7 +1647,7 @@ return 0; } -static struct pci_device_id serial_pci_tbl[] __devinitdata = { +static struct pci_device_id serial_pci_tbl[] = { { PCI_VENDOR_ID_V3, PCI_DEVICE_ID_V3_V960, PCI_SUBVENDOR_ID_CONNECT_TECH, PCI_SUBDEVICE_ID_CONNECT_TECH_BH8_232, 0, 0, ^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH] PCI fixes for 2.6.0-test2 2003-08-01 19:32 ` Greg KH @ 2003-08-01 19:32 ` Greg KH 2003-08-01 19:32 ` Greg KH 0 siblings, 1 reply; 9+ messages in thread From: Greg KH @ 2003-08-01 19:32 UTC (permalink / raw) To: linux-kernel ChangeSet 1.1547.13.2, 2003/08/01 10:13:16-07:00, mitch@sfgoth.com [PATCH] PCI: Trivial DMA-mapping.txt fix As far as I can tell "pci_set_consistent()" doesn't exist - the docs probably meant to say "pci_set_consistent_dma_mask()". Documentation/DMA-mapping.txt | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) diff -Nru a/Documentation/DMA-mapping.txt b/Documentation/DMA-mapping.txt --- a/Documentation/DMA-mapping.txt Fri Aug 1 12:17:38 2003 +++ b/Documentation/DMA-mapping.txt Fri Aug 1 12:17:38 2003 @@ -183,7 +183,7 @@ pci_set_consistent_dma_mask() will always be able to set the same or a smaller mask as pci_set_dma_mask(). However for the rare case that a device driver only uses consistent allocations, one would have to -check the return value from pci_set_consistent(). +check the return value from pci_set_consistent_dma_mask(). If your 64-bit device is going to be an enormous consumer of DMA mappings, this can be problematic since the DMA mappings are a ^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH] PCI fixes for 2.6.0-test2 2003-08-01 19:32 ` Greg KH @ 2003-08-01 19:32 ` Greg KH 0 siblings, 0 replies; 9+ messages in thread From: Greg KH @ 2003-08-01 19:32 UTC (permalink / raw) To: linux-kernel ChangeSet 1.1547.13.3, 2003/08/01 10:13:46-07:00, mitch@sfgoth.com [PATCH] PCI: add 2 entries to pci_ids.h These have been in the pci.ids file for awhile but not in <linux/pci_ids.h> They're used by my drivers/atm/lanai.c driver that has been in tree for some time now (it provides its own copy of these #define's protected by an #ifndef - I'll remove that once this patch goes into the mainline) include/linux/pci_ids.h | 2 ++ 1 files changed, 2 insertions(+) diff -Nru a/include/linux/pci_ids.h b/include/linux/pci_ids.h --- a/include/linux/pci_ids.h Fri Aug 1 12:17:29 2003 +++ b/include/linux/pci_ids.h Fri Aug 1 12:17:29 2003 @@ -1205,6 +1205,8 @@ #define PCI_VENDOR_ID_EF 0x111a #define PCI_DEVICE_ID_EF_ATM_FPGA 0x0000 #define PCI_DEVICE_ID_EF_ATM_ASIC 0x0002 +#define PCI_VENDOR_ID_EF_ATM_LANAI2 0x0003 +#define PCI_VENDOR_ID_EF_ATM_LANAIHB 0x0005 #define PCI_VENDOR_ID_IDT 0x111d #define PCI_DEVICE_ID_IDT_IDT77201 0x0001 ^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2003-08-01 19:44 UTC | newest] Thread overview: 9+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2003-08-01 19:29 [BK PATCH] PCI fixes for 2.6.0-test2 Greg KH 2003-08-01 19:31 ` [PATCH] " Greg KH 2003-08-01 19:31 ` Greg KH 2003-08-01 19:31 ` Greg KH 2003-08-01 19:31 ` Greg KH 2003-08-01 19:32 ` Greg KH 2003-08-01 19:32 ` Greg KH 2003-08-01 19:32 ` Greg KH 2003-08-01 19:32 ` Greg KH
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).