Commit 193fb7da authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman

[PATCH] PCI: pci_device_id can not be marked __devinitdata.

fixes up drivers/i2c/* drivers/ide/* and drivers/ieee1394/*
parent bf4e4884
......@@ -494,7 +494,7 @@ static struct i2c_adapter ali1535_adapter = {
}
};
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,
......
......@@ -486,7 +486,7 @@ static struct i2c_adapter ali15x3_adapter = {
},
};
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,
......
......@@ -322,7 +322,7 @@ static struct i2c_adapter amd756_adapter = {
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 },
......
......@@ -331,7 +331,7 @@ static struct i2c_algorithm smbus_algorithm = {
};
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, }
};
......
......@@ -556,7 +556,7 @@ static struct i2c_adapter i801_adapter = {
},
};
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,
......
......@@ -402,7 +402,7 @@ static struct i2c_adapter piix4_adapter = {
},
};
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,
......
......@@ -276,7 +276,7 @@ static struct i2c_adapter sis96x_adapter = {
},
};
static struct pci_device_id sis96x_ids[] __devinitdata = {
static struct pci_device_id sis96x_ids[] = {
{
.vendor = PCI_VENDOR_ID_SI,
......
......@@ -401,7 +401,7 @@ static void __devexit vt596_remove(struct pci_dev *pdev)
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,
......
......@@ -914,7 +914,7 @@ static void via686a_update_client(struct i2c_client *client)
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,
......
......@@ -321,7 +321,7 @@ static int __devinit prosavage_probe(struct pci_dev *dev, const struct pci_devic
/*
* 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,
......
......@@ -533,7 +533,7 @@ static int __devinit aec62xx_init_one(struct pci_dev *dev, const struct pci_devi
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 },
......
......@@ -872,7 +872,7 @@ static int __devinit alim15x3_init_one(struct pci_dev *dev, const struct pci_dev
}
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, },
};
......
......@@ -440,7 +440,7 @@ static int __devinit amd74xx_probe(struct pci_dev *dev, const struct pci_device_
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},
......
......@@ -763,7 +763,7 @@ static int __devinit cmd64x_init_one(struct pci_dev *dev, const struct pci_devic
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},
......
......@@ -296,7 +296,7 @@ static int __devinit cs5520_init_one(struct pci_dev *dev, const struct pci_devic
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, },
......
......@@ -431,7 +431,7 @@ static int __devinit cs5530_init_one(struct pci_dev *dev, const struct pci_devic
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, },
};
......
......@@ -439,7 +439,7 @@ static int __devinit cy82c693_init_one(struct pci_dev *dev, const struct pci_dev
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, },
};
......
......@@ -130,7 +130,7 @@ static int __devinit generic_init_one(struct pci_dev *dev, const struct pci_devi
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},
......
......@@ -339,7 +339,7 @@ static int __devinit hpt34x_init_one(struct pci_dev *dev, const struct pci_devic
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, },
};
......
......@@ -1190,7 +1190,7 @@ static int __devinit hpt366_init_one(struct pci_dev *dev, const struct pci_devic
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},
......
......@@ -303,7 +303,7 @@ static int __devinit it8172_init_one(struct pci_dev *dev, const struct pci_devic
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, },
};
......
......@@ -236,7 +236,7 @@ static int __devinit ns87415_init_one(struct pci_dev *dev, const struct pci_devi
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, },
};
......
......@@ -371,7 +371,7 @@ static int __devinit opti621_init_one(struct pci_dev *dev, const struct pci_devi
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, },
......
......@@ -636,7 +636,7 @@ static int __devinit pdc202new_init_one(struct pci_dev *dev, const struct pci_de
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},
......
......@@ -928,7 +928,7 @@ static int __devinit pdc202xx_init_one(struct pci_dev *dev, const struct pci_dev
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},
......
......@@ -134,7 +134,7 @@ static int __devinit pdcadma_init_one(struct pci_dev *dev, const struct pci_devi
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, },
};
......
......@@ -792,7 +792,7 @@ static void __init piix_check_450nx(void)
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},
......
......@@ -66,7 +66,7 @@ static int __devinit rz1000_init_one(struct pci_dev *dev, const struct pci_devic
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, },
......
......@@ -564,7 +564,7 @@ static int __devinit sc1200_init_one(struct pci_dev *dev, const struct pci_devic
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, },
};
......
......@@ -799,7 +799,7 @@ static int __devinit svwks_init_one(struct pci_dev *dev, const struct pci_device
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},
......
......@@ -826,7 +826,7 @@ static int __devinit siimage_init_one(struct pci_dev *dev, const struct pci_devi
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, },
......
......@@ -961,7 +961,7 @@ static int __devinit sis5513_init_one(struct pci_dev *dev, const struct pci_devi
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, },
};
......
......@@ -511,7 +511,7 @@ static int __devinit sl82c105_init_one(struct pci_dev *dev, const struct pci_dev
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, },
};
......
......@@ -381,7 +381,7 @@ static int __devinit slc90e66_init_one(struct pci_dev *dev, const struct pci_dev
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, },
};
......
......@@ -41,7 +41,7 @@ static ide_pci_host_proc_t triflex_proc __initdata = {
};
#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, },
......
......@@ -407,7 +407,7 @@ static int __devinit trm290_init_one(struct pci_dev *dev, const struct pci_devic
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, },
};
......
......@@ -638,7 +638,7 @@ static int __devinit via_init_one(struct pci_dev *dev, const struct pci_device_i
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, },
......
......@@ -3571,7 +3571,7 @@ static int ohci1394_pci_resume (struct pci_dev *dev)
#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,
......
......@@ -1897,7 +1897,7 @@ static size_t get_lynx_rom(struct hpsb_host *host, quadlet_t **ptr)
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,
......
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