Skip to content

L
linux
Commit 373a4f52 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files
Options

[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/*
parent 193fb7da
Hide whitespace changes
Inline Side-by-side
Showing with 33 additions and 34 deletions
drivers/input/gameport/cs461x.c
View file @ 373a4f52
......@@ -216,7 +216,7 @@ static int cs461x_gameport_open(struct gameport *gameport, int mode)
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 */
......
drivers/input/gameport/emu10k1-gp.c
View file @ 373a4f52
......@@ -49,7 +49,7 @@ struct emu {
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, }
......
drivers/input/gameport/fm801-gp.c
View file @ 373a4f52
......@@ -131,7 +131,7 @@ static void __devexit fm801_gp_remove(struct pci_dev *pci)
}
}
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 }
};
......
drivers/input/gameport/vortex.c
View file @ 373a4f52
......@@ -159,7 +159,7 @@ static void __devexit vortex_remove(struct pci_dev *dev)
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 }};
......
drivers/isdn/hardware/avm/b1pci.c
View file @ 373a4f52
......@@ -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 */
};
......
drivers/isdn/hardware/avm/c4.c
View file @ 373a4f52
......@@ -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 */
......
drivers/isdn/hardware/avm/t1pci.c
View file @ 373a4f52
......@@ -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 */
};
......
drivers/isdn/hardware/eicon/divasmain.c
View file @ 373a4f52
......@@ -119,7 +119,7 @@ typedef struct _diva_os_thread_dpc {
/*
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},
......
drivers/isdn/hisax/hisax_fcpcipnp.c
View file @ 373a4f52
......@@ -46,7 +46,7 @@ MODULE_PARM(debug, "i");
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,
......
drivers/isdn/hisax/hisax_hfcpci.c
View file @ 373a4f52
......@@ -47,7 +47,7 @@ MODULE_DESCRIPTION("HFC PCI ISDN driver");
.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"),
......
drivers/isdn/tpam/tpam_main.c
View file @ 373a4f52
......@@ -241,7 +241,7 @@ static void __devexit tpam_remove(struct pci_dev *pcidev) {
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 },
{ }
......
drivers/media/radio/radio-maxiradio.c
View file @ 373a4f52
......@@ -327,7 +327,7 @@ static void __devexit maxiradio_remove_one(struct pci_dev *pdev)
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,}
......
drivers/media/video/bttv-driver.c
View file @ 373a4f52
......@@ -3496,7 +3496,7 @@ static void __devexit bttv_remove(struct pci_dev *pci_dev)
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,
......
drivers/media/video/meye.c
View file @ 373a4f52
......@@ -1416,7 +1416,7 @@ static void __devexit meye_remove(struct pci_dev *pcidev) {
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 },
{ }
......
drivers/mtd/maps/amd76xrom.c
View file @ 373a4f52
......@@ -160,7 +160,7 @@ static void __devexit amd76xrom_remove_one (struct pci_dev *pdev)
#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,
......
drivers/mtd/maps/ich2rom.c
View file @ 373a4f52
......@@ -260,7 +260,7 @@ static void __devexit ich2rom_remove_one (struct pci_dev *pdev)
#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,
......
drivers/mtd/maps/pci.c
View file @ 373a4f52
......@@ -191,7 +191,7 @@ static struct mtd_pci_info intel_dc21285_info = {
* 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,
......
drivers/mtd/maps/scb2_flash.c
View file @ 373a4f52
......@@ -218,7 +218,7 @@ scb2_flash_remove(struct pci_dev *dev)
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,
......
drivers/parisc/eisa.c
View file @ 373a4f52
......@@ -398,7 +398,7 @@ static int __devinit eisa_probe(struct parisc_device *dev)
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, }
......
drivers/parisc/superio.c
View file @ 373a4f52
......@@ -517,7 +517,7 @@ static int __devinit superio_probe(struct pci_dev *dev, const struct pci_device_
}
}
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, }
};
......
drivers/parport/parport_pc.c
View file @ 373a4f52
......@@ -2825,7 +2825,7 @@ static struct parport_pc_pci {
/* 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,
......
drivers/parport/parport_serial.c
View file @ 373a4f52
......@@ -87,7 +87,7 @@ static struct parport_pc_pci {
/* 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 },
......
drivers/pci/hotplug/cpcihp_zt5550.c
View file @ 373a4f52
......@@ -187,8 +187,7 @@ int zt5550_hc_disable_irq(void)
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 void __devexit zt5550_hc_remove_one(struct pci_dev *pdev)
}
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, }
};
......
drivers/pci/hotplug/cpqphp_core.c
View file @ 373a4f52
......@@ -1488,7 +1488,7 @@ static void unload_cpqphpd(void)
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),
......
drivers/pci/hotplug/ibmphp_ebda.c
View file @ 373a4f52
......@@ -1230,7 +1230,7 @@ void ibmphp_free_ebda_pci_rsrc_queue (void)
}
}
static struct pci_device_id id_table[] __devinitdata = {
static struct pci_device_id id_table[] = {
{
.vendor = PCI_VENDOR_ID_IBM,
.device = HPC_DEVICE_ID,
......
drivers/pcmcia/yenta_socket.c
View file @ 373a4f52
......@@ -911,7 +911,7 @@ static int yenta_dev_resume (struct pci_dev *dev)
}
static struct pci_device_id yenta_table [] __devinitdata = { {
static struct pci_device_id yenta_table [] = { {
.class = PCI_CLASS_BRIDGE_CARDBUS << 8,
.class_mask = ~0,
......
drivers/scsi/dc395x.c
View file @ 373a4f52
......@@ -6237,7 +6237,7 @@ static void __devexit dc395x_remove_one(struct pci_dev *pdev)
* 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,
......
drivers/scsi/gdth.c
View file @ 373a4f52
......@@ -862,7 +862,7 @@ GDTH_INITFUNC(static int, gdth_search_pci(gdth_pci_str *pcistr))
/* 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},
......
drivers/scsi/ips.c
View file @ 373a4f52
......@@ -280,7 +280,7 @@ IPS_DEFINE_COMPAT_TABLE( Compatable ); /* Version Compatability Ta
/* 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 },
......
drivers/scsi/nsp32.c
View file @ 373a4f52
......@@ -2001,7 +2001,7 @@ static void __devexit nsp32_remove(struct pci_dev *pdev)
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,
......
drivers/scsi/tmscsim.c
View file @ 373a4f52
......@@ -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,
......
drivers/serial/8250_pci.c
View file @ 373a4f52
......@@ -1647,7 +1647,7 @@ static int pciserial_resume_one(struct pci_dev *dev)
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,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7