mirror of
https://github.com/torvalds/linux.git
synced 2024-11-22 20:22:09 +00:00
[libata] constify PCI ID table in several drivers
This commit is contained in:
parent
f51750d5ea
commit
3b7d697dfb
@ -255,7 +255,7 @@ static struct ata_port_info ahci_port_info[] = {
|
||||
},
|
||||
};
|
||||
|
||||
static struct pci_device_id ahci_pci_tbl[] = {
|
||||
static const struct pci_device_id ahci_pci_tbl[] = {
|
||||
{ PCI_VENDOR_ID_INTEL, 0x2652, PCI_ANY_ID, PCI_ANY_ID, 0, 0,
|
||||
board_ahci }, /* ICH6 */
|
||||
{ PCI_VENDOR_ID_INTEL, 0x2653, PCI_ANY_ID, PCI_ANY_ID, 0, 0,
|
||||
|
@ -95,7 +95,7 @@ static void piix_set_dmamode (struct ata_port *ap, struct ata_device *adev);
|
||||
|
||||
static unsigned int in_module_init = 1;
|
||||
|
||||
static struct pci_device_id piix_pci_tbl[] = {
|
||||
static const struct pci_device_id piix_pci_tbl[] = {
|
||||
#ifdef ATA_ENABLE_PATA
|
||||
{ 0x8086, 0x7111, PCI_ANY_ID, PCI_ANY_ID, 0, 0, piix4_pata },
|
||||
{ 0x8086, 0x24db, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich5_pata },
|
||||
|
@ -190,7 +190,7 @@ static struct ata_port_info adma_port_info[] = {
|
||||
},
|
||||
};
|
||||
|
||||
static struct pci_device_id adma_ata_pci_tbl[] = {
|
||||
static const struct pci_device_id adma_ata_pci_tbl[] = {
|
||||
{ PCI_VENDOR_ID_PDC, 0x1841, PCI_ANY_ID, PCI_ANY_ID, 0, 0,
|
||||
board_1841_idx },
|
||||
|
||||
|
@ -349,7 +349,7 @@ static struct ata_port_info mv_port_info[] = {
|
||||
},
|
||||
};
|
||||
|
||||
static struct pci_device_id mv_pci_tbl[] = {
|
||||
static const struct pci_device_id mv_pci_tbl[] = {
|
||||
{PCI_DEVICE(PCI_VENDOR_ID_MARVELL, 0x5040), 0, 0, chip_504x},
|
||||
{PCI_DEVICE(PCI_VENDOR_ID_MARVELL, 0x5041), 0, 0, chip_504x},
|
||||
{PCI_DEVICE(PCI_VENDOR_ID_MARVELL, 0x5080), 0, 0, chip_508x},
|
||||
|
@ -137,7 +137,7 @@ enum nv_host_type
|
||||
CK804
|
||||
};
|
||||
|
||||
static struct pci_device_id nv_pci_tbl[] = {
|
||||
static const struct pci_device_id nv_pci_tbl[] = {
|
||||
{ PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE2S_SATA,
|
||||
PCI_ANY_ID, PCI_ANY_ID, 0, 0, NFORCE2 },
|
||||
{ PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE3S_SATA,
|
||||
|
@ -193,7 +193,7 @@ static struct ata_port_info pdc_port_info[] = {
|
||||
},
|
||||
};
|
||||
|
||||
static struct pci_device_id pdc_ata_pci_tbl[] = {
|
||||
static const struct pci_device_id pdc_ata_pci_tbl[] = {
|
||||
{ PCI_VENDOR_ID_PROMISE, 0x3371, PCI_ANY_ID, PCI_ANY_ID, 0, 0,
|
||||
board_2037x },
|
||||
{ PCI_VENDOR_ID_PROMISE, 0x3570, PCI_ANY_ID, PCI_ANY_ID, 0, 0,
|
||||
|
@ -184,7 +184,7 @@ static struct ata_port_info qs_port_info[] = {
|
||||
},
|
||||
};
|
||||
|
||||
static struct pci_device_id qs_ata_pci_tbl[] = {
|
||||
static const struct pci_device_id qs_ata_pci_tbl[] = {
|
||||
{ PCI_VENDOR_ID_PDC, 0x2068, PCI_ANY_ID, PCI_ANY_ID, 0, 0,
|
||||
board_2068_idx },
|
||||
|
||||
|
@ -87,7 +87,7 @@ static void sil_scr_write (struct ata_port *ap, unsigned int sc_reg, u32 val);
|
||||
static void sil_post_set_mode (struct ata_port *ap);
|
||||
|
||||
|
||||
static struct pci_device_id sil_pci_tbl[] = {
|
||||
static const struct pci_device_id sil_pci_tbl[] = {
|
||||
{ 0x1095, 0x3112, PCI_ANY_ID, PCI_ANY_ID, 0, 0, sil_3112_m15w },
|
||||
{ 0x1095, 0x0240, PCI_ANY_ID, PCI_ANY_ID, 0, 0, sil_3112_m15w },
|
||||
{ 0x1095, 0x3512, PCI_ANY_ID, PCI_ANY_ID, 0, 0, sil_3112 },
|
||||
|
@ -240,7 +240,7 @@ static void sil24_port_stop(struct ata_port *ap);
|
||||
static void sil24_host_stop(struct ata_host_set *host_set);
|
||||
static int sil24_init_one(struct pci_dev *pdev, const struct pci_device_id *ent);
|
||||
|
||||
static struct pci_device_id sil24_pci_tbl[] = {
|
||||
static const struct pci_device_id sil24_pci_tbl[] = {
|
||||
{ 0x1095, 0x3124, PCI_ANY_ID, PCI_ANY_ID, 0, 0, BID_SIL3124 },
|
||||
{ 0x1095, 0x3132, PCI_ANY_ID, PCI_ANY_ID, 0, 0, BID_SIL3132 },
|
||||
{ 0x1095, 0x3131, PCI_ANY_ID, PCI_ANY_ID, 0, 0, BID_SIL3131 },
|
||||
|
@ -67,7 +67,7 @@ static int sis_init_one (struct pci_dev *pdev, const struct pci_device_id *ent);
|
||||
static u32 sis_scr_read (struct ata_port *ap, unsigned int sc_reg);
|
||||
static void sis_scr_write (struct ata_port *ap, unsigned int sc_reg, u32 val);
|
||||
|
||||
static struct pci_device_id sis_pci_tbl[] = {
|
||||
static const struct pci_device_id sis_pci_tbl[] = {
|
||||
{ PCI_VENDOR_ID_SI, 0x180, PCI_ANY_ID, PCI_ANY_ID, 0, 0, sis_180 },
|
||||
{ PCI_VENDOR_ID_SI, 0x181, PCI_ANY_ID, PCI_ANY_ID, 0, 0, sis_180 },
|
||||
{ PCI_VENDOR_ID_SI, 0x182, PCI_ANY_ID, PCI_ANY_ID, 0, 0, sis_180 },
|
||||
|
@ -466,7 +466,7 @@ err_out:
|
||||
* 0x24a is device ID for BCM5785 (aka HT1000) HT southbridge integrated SATA
|
||||
* controller
|
||||
* */
|
||||
static struct pci_device_id k2_sata_pci_tbl[] = {
|
||||
static const struct pci_device_id k2_sata_pci_tbl[] = {
|
||||
{ 0x1166, 0x0240, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 4 },
|
||||
{ 0x1166, 0x0241, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 4 },
|
||||
{ 0x1166, 0x0242, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 8 },
|
||||
|
@ -229,7 +229,7 @@ static struct ata_port_info pdc_port_info[] = {
|
||||
|
||||
};
|
||||
|
||||
static struct pci_device_id pdc_sata_pci_tbl[] = {
|
||||
static const struct pci_device_id pdc_sata_pci_tbl[] = {
|
||||
{ PCI_VENDOR_ID_PROMISE, 0x6622, PCI_ANY_ID, PCI_ANY_ID, 0, 0,
|
||||
board_20621 },
|
||||
{ } /* terminate list */
|
||||
|
@ -55,7 +55,7 @@ static int uli_init_one (struct pci_dev *pdev, const struct pci_device_id *ent);
|
||||
static u32 uli_scr_read (struct ata_port *ap, unsigned int sc_reg);
|
||||
static void uli_scr_write (struct ata_port *ap, unsigned int sc_reg, u32 val);
|
||||
|
||||
static struct pci_device_id uli_pci_tbl[] = {
|
||||
static const struct pci_device_id uli_pci_tbl[] = {
|
||||
{ PCI_VENDOR_ID_AL, 0x5289, PCI_ANY_ID, PCI_ANY_ID, 0, 0, uli_5289 },
|
||||
{ PCI_VENDOR_ID_AL, 0x5287, PCI_ANY_ID, PCI_ANY_ID, 0, 0, uli_5287 },
|
||||
{ PCI_VENDOR_ID_AL, 0x5281, PCI_ANY_ID, PCI_ANY_ID, 0, 0, uli_5281 },
|
||||
|
@ -75,7 +75,7 @@ static int svia_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)
|
||||
static u32 svia_scr_read (struct ata_port *ap, unsigned int sc_reg);
|
||||
static void svia_scr_write (struct ata_port *ap, unsigned int sc_reg, u32 val);
|
||||
|
||||
static struct pci_device_id svia_pci_tbl[] = {
|
||||
static const struct pci_device_id svia_pci_tbl[] = {
|
||||
{ 0x1106, 0x3149, PCI_ANY_ID, PCI_ANY_ID, 0, 0, vt6420 },
|
||||
{ 0x1106, 0x3249, PCI_ANY_ID, PCI_ANY_ID, 0, 0, vt6421 },
|
||||
|
||||
|
@ -400,7 +400,7 @@ err_out:
|
||||
* 0x8086/0x3200 is the Intel 31244, which is supposed to be identical
|
||||
* compatibility is untested as of yet
|
||||
*/
|
||||
static struct pci_device_id vsc_sata_pci_tbl[] = {
|
||||
static const struct pci_device_id vsc_sata_pci_tbl[] = {
|
||||
{ 0x1725, 0x7174, PCI_ANY_ID, PCI_ANY_ID, 0x10600, 0xFFFFFF, 0 },
|
||||
{ 0x8086, 0x3200, PCI_ANY_ID, PCI_ANY_ID, 0x10600, 0xFFFFFF, 0 },
|
||||
{ }
|
||||
|
Loading…
Reference in New Issue
Block a user