Gh0st
/
linux
mirror of https://github.com/torvalds/linux.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

scsi: Constify struct pci_device_id 

'struct pci_device_id' is not modified in these drivers.

Constifying this structure moves some data to a read-only section, so
increase overall security.

On a x86_64, with allmodconfig, as an example:
Before:
======
   text	   data	    bss	    dec	    hex	filename
  70237	   9137	    320	  79694	  1374e	drivers/scsi/3w-9xxx.o

After:
=====
   text	   data	    bss	    dec	    hex	filename
  70461	   8913	    320	  79694	  1374e	drivers/scsi/3w-9xxx.o

Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Link: https://lore.kernel.org/r/fc61b1946488c1ea8f7a17a06cf40fbd05dcc6de.1733590049.git.christophe.jaillet@wanadoo.fr
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
This commit is contained in:
Christophe JAILLET 2024-12-07 17:48:28 +01:00 committed by Martin K. Petersen
parent 6cb7063feb
commit c9a71ca13f
32 changed files with 32 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/scsi/3w-9xxx.c
View File

@ -2261,7 +2261,7 @@ static int __maybe_unused twa_resume(struct device *dev)
} /* End twa_resume() */ } /* End twa_resume() */
/* PCI Devices supported by this driver */ /* PCI Devices supported by this driver */
static struct pci_device_id twa_pci_tbl[] = { static const struct pci_device_id twa_pci_tbl[] = {
{ PCI_VENDOR_ID_3WARE, PCI_DEVICE_ID_3WARE_9000, { PCI_VENDOR_ID_3WARE, PCI_DEVICE_ID_3WARE_9000,
PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
{ PCI_VENDOR_ID_3WARE, PCI_DEVICE_ID_3WARE_9550SX, { PCI_VENDOR_ID_3WARE, PCI_DEVICE_ID_3WARE_9550SX,

2
drivers/scsi/3w-sas.c
View File

@ -1822,7 +1822,7 @@ static int __maybe_unused twl_resume(struct device *dev)
} /* End twl_resume() */ } /* End twl_resume() */
/* PCI Devices supported by this driver */ /* PCI Devices supported by this driver */
static struct pci_device_id twl_pci_tbl[] = { static const struct pci_device_id twl_pci_tbl[] = {
{ PCI_VDEVICE(3WARE, PCI_DEVICE_ID_3WARE_9750) }, { PCI_VDEVICE(3WARE, PCI_DEVICE_ID_3WARE_9750) },
{ } { }
}; };

2
drivers/scsi/3w-xxxx.c
View File

@ -2393,7 +2393,7 @@ static void tw_remove(struct pci_dev *pdev)
} /* End tw_remove() */ } /* End tw_remove() */
/* PCI Devices supported by this driver */ /* PCI Devices supported by this driver */
static struct pci_device_id tw_pci_tbl[] = { static const struct pci_device_id tw_pci_tbl[] = {
{ PCI_VENDOR_ID_3WARE, PCI_DEVICE_ID_3WARE_1000, { PCI_VENDOR_ID_3WARE, PCI_DEVICE_ID_3WARE_1000,
PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
{ PCI_VENDOR_ID_3WARE, PCI_DEVICE_ID_3WARE_7000, { PCI_VENDOR_ID_3WARE, PCI_DEVICE_ID_3WARE_7000,

2
drivers/scsi/BusLogic.c
View File

@ -3716,7 +3716,7 @@ static void __exit blogic_exit(void)
__setup("BusLogic=", blogic_setup); __setup("BusLogic=", blogic_setup);
#ifdef MODULE #ifdef MODULE
/*static struct pci_device_id blogic_pci_tbl[] = { /*static const struct pci_device_id blogic_pci_tbl[] = {
{ PCI_VENDOR_ID_BUSLOGIC, PCI_DEVICE_ID_BUSLOGIC_MULTIMASTER, { PCI_VENDOR_ID_BUSLOGIC, PCI_DEVICE_ID_BUSLOGIC_MULTIMASTER,
PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
{ PCI_VENDOR_ID_BUSLOGIC, PCI_DEVICE_ID_BUSLOGIC_MULTIMASTER_NC, { PCI_VENDOR_ID_BUSLOGIC, PCI_DEVICE_ID_BUSLOGIC_MULTIMASTER_NC,

2
drivers/scsi/a100u2w.c
View File

@ -1206,7 +1206,7 @@ static void inia100_remove_one(struct pci_dev *pdev)
scsi_host_put(shost); scsi_host_put(shost);
} }
static struct pci_device_id inia100_pci_tbl[] = { static const struct pci_device_id inia100_pci_tbl[] = {
{PCI_VENDOR_ID_INIT, 0x1060, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, {PCI_VENDOR_ID_INIT, 0x1060, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
{0,} {0,}
}; };

2
drivers/scsi/advansys.c
View File

@ -11409,7 +11409,7 @@ static struct eisa_driver advansys_eisa_driver = {
}; };
/* PCI Devices supported by this driver */ /* PCI Devices supported by this driver */
static struct pci_device_id advansys_pci_tbl[] = { static const struct pci_device_id advansys_pci_tbl[] = {
{PCI_VENDOR_ID_ASP, PCI_DEVICE_ID_ASP_1200A, {PCI_VENDOR_ID_ASP, PCI_DEVICE_ID_ASP_1200A,
PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
{PCI_VENDOR_ID_ASP, PCI_DEVICE_ID_ASP_ABP940, {PCI_VENDOR_ID_ASP, PCI_DEVICE_ID_ASP_ABP940,

2
drivers/scsi/am53c974.c
View File

@ -513,7 +513,7 @@ static void pci_esp_remove_one(struct pci_dev *pdev)
scsi_host_put(esp->host); scsi_host_put(esp->host);
} }
static struct pci_device_id am53c974_pci_tbl[] = { static const struct pci_device_id am53c974_pci_tbl[] = {
{ PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_SCSI, { PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_SCSI,
PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 }, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
{ } { }

2
drivers/scsi/arcmsr/arcmsr_hba.c
View File

@ -172,7 +172,7 @@ static const struct scsi_host_template arcmsr_scsi_host_template = {
.no_write_same = 1, .no_write_same = 1,
}; };
static struct pci_device_id arcmsr_device_id_table[] = { static const struct pci_device_id arcmsr_device_id_table[] = {
{PCI_DEVICE(PCI_VENDOR_ID_ARECA, PCI_DEVICE_ID_ARECA_1110), {PCI_DEVICE(PCI_VENDOR_ID_ARECA, PCI_DEVICE_ID_ARECA_1110),
.driver_data = ACB_ADAPTER_TYPE_A}, .driver_data = ACB_ADAPTER_TYPE_A},
{PCI_DEVICE(PCI_VENDOR_ID_ARECA, PCI_DEVICE_ID_ARECA_1120), {PCI_DEVICE(PCI_VENDOR_ID_ARECA, PCI_DEVICE_ID_ARECA_1120),

2
drivers/scsi/atp870u.c
View File

@ -1743,7 +1743,7 @@ static const struct scsi_host_template atp870u_template = {
.max_sectors = ATP870U_MAX_SECTORS, .max_sectors = ATP870U_MAX_SECTORS,
}; };
static struct pci_device_id atp870u_id_table[] = { static const struct pci_device_id atp870u_id_table[] = {
{ PCI_DEVICE(PCI_VENDOR_ID_ARTOP, ATP885_DEVID) }, { PCI_DEVICE(PCI_VENDOR_ID_ARTOP, ATP885_DEVID) },
{ PCI_DEVICE(PCI_VENDOR_ID_ARTOP, ATP880_DEVID1) }, { PCI_DEVICE(PCI_VENDOR_ID_ARTOP, ATP880_DEVID1) },
{ PCI_DEVICE(PCI_VENDOR_ID_ARTOP, ATP880_DEVID2) }, { PCI_DEVICE(PCI_VENDOR_ID_ARTOP, ATP880_DEVID2) },

2
drivers/scsi/cxlflash/main.c
View File

@ -3177,7 +3177,7 @@ static struct dev_dependent_vals dev_briard_vals = { CXLFLASH_MAX_SECTORS,
/* /*
* PCI device binding table * PCI device binding table
*/ */
static struct pci_device_id cxlflash_pci_table[] = { static const struct pci_device_id cxlflash_pci_table[] = {
{PCI_VENDOR_ID_IBM, PCI_DEVICE_ID_IBM_CORSA, {PCI_VENDOR_ID_IBM, PCI_DEVICE_ID_IBM_CORSA,
PCI_ANY_ID, PCI_ANY_ID, 0, 0, (kernel_ulong_t)&dev_corsa_vals}, PCI_ANY_ID, PCI_ANY_ID, 0, 0, (kernel_ulong_t)&dev_corsa_vals},
{PCI_VENDOR_ID_IBM, PCI_DEVICE_ID_IBM_FLASH_GT, {PCI_VENDOR_ID_IBM, PCI_DEVICE_ID_IBM_FLASH_GT,

2
drivers/scsi/dc395x.c
View File

@ -4668,7 +4668,7 @@ static void dc395x_remove_one(struct pci_dev *dev)
} }
static struct pci_device_id dc395x_pci_table[] = { static const struct pci_device_id dc395x_pci_table[] = {
{ {
.vendor = PCI_VENDOR_ID_TEKRAM, .vendor = PCI_VENDOR_ID_TEKRAM,
.device = PCI_DEVICE_ID_TEKRAM_TRMS1040, .device = PCI_DEVICE_ID_TEKRAM_TRMS1040,

2
drivers/scsi/dmx3191d.c
View File

@ -127,7 +127,7 @@ static void dmx3191d_remove_one(struct pci_dev *pdev)
pci_disable_device(pdev); pci_disable_device(pdev);
} }
static struct pci_device_id dmx3191d_pci_tbl[] = { static const struct pci_device_id dmx3191d_pci_tbl[] = {
{PCI_VENDOR_ID_DOMEX, PCI_DEVICE_ID_DOMEX_DMX3191D, {PCI_VENDOR_ID_DOMEX, PCI_DEVICE_ID_DOMEX_DMX3191D,
PCI_ANY_ID, PCI_ANY_ID, 0, 0, 4}, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 4},
{ } { }

2
drivers/scsi/elx/efct/efct_driver.c
View File

@ -470,7 +470,7 @@ efct_setup_msix(struct efct *efct, u32 num_intrs)
return rc; return rc;
} }
static struct pci_device_id efct_pci_table[] = { static const struct pci_device_id efct_pci_table[] = {
{PCI_DEVICE(EFCT_VENDOR_ID, EFCT_DEVICE_LANCER_G6), 0}, {PCI_DEVICE(EFCT_VENDOR_ID, EFCT_DEVICE_LANCER_G6), 0},
{PCI_DEVICE(EFCT_VENDOR_ID, EFCT_DEVICE_LANCER_G7), 0}, {PCI_DEVICE(EFCT_VENDOR_ID, EFCT_DEVICE_LANCER_G7), 0},
{} /* terminate list */ {} /* terminate list */

2
drivers/scsi/fdomain_pci.c
View File

@ -47,7 +47,7 @@ static void fdomain_pci_remove(struct pci_dev *pdev)
pci_disable_device(pdev); pci_disable_device(pdev);
} }
static struct pci_device_id fdomain_pci_table[] = { static const struct pci_device_id fdomain_pci_table[] = {
{ PCI_DEVICE(PCI_VENDOR_ID_FD, PCI_DEVICE_ID_FD_36C70) }, { PCI_DEVICE(PCI_VENDOR_ID_FD, PCI_DEVICE_ID_FD_36C70) },
{} {}
}; };

2
drivers/scsi/fnic/fnic_main.c
View File

@ -44,7 +44,7 @@ static DEFINE_SPINLOCK(fnic_list_lock);
static DEFINE_IDA(fnic_ida); static DEFINE_IDA(fnic_ida);
/* Supported devices by fnic module */ /* Supported devices by fnic module */
static struct pci_device_id fnic_id_table[] = { static const struct pci_device_id fnic_id_table[] = {
{ PCI_DEVICE(PCI_VENDOR_ID_CISCO, PCI_DEVICE_ID_CISCO_FNIC) }, { PCI_DEVICE(PCI_VENDOR_ID_CISCO, PCI_DEVICE_ID_CISCO_FNIC) },
{ 0, } { 0, }
}; };

2
drivers/scsi/hptiop.c
View File

@ -1634,7 +1634,7 @@ static struct hptiop_adapter_ops hptiop_mvfrey_ops = {
.host_phy_flag = cpu_to_le64(1), .host_phy_flag = cpu_to_le64(1),
}; };
static struct pci_device_id hptiop_id_table[] = { static const struct pci_device_id hptiop_id_table[] = {
{ PCI_VDEVICE(TTI, 0x3220), (kernel_ulong_t)&hptiop_itl_ops }, { PCI_VDEVICE(TTI, 0x3220), (kernel_ulong_t)&hptiop_itl_ops },
{ PCI_VDEVICE(TTI, 0x3320), (kernel_ulong_t)&hptiop_itl_ops }, { PCI_VDEVICE(TTI, 0x3320), (kernel_ulong_t)&hptiop_itl_ops },
{ PCI_VDEVICE(TTI, 0x3410), (kernel_ulong_t)&hptiop_itl_ops }, { PCI_VDEVICE(TTI, 0x3410), (kernel_ulong_t)&hptiop_itl_ops },

2
drivers/scsi/initio.c
View File

@ -2941,7 +2941,7 @@ static void initio_remove_one(struct pci_dev *pdev)
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
static struct pci_device_id initio_pci_tbl[] = { static const struct pci_device_id initio_pci_tbl[] = {
{PCI_VENDOR_ID_INIT, 0x9500, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, {PCI_VENDOR_ID_INIT, 0x9500, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
{PCI_VENDOR_ID_INIT, 0x9400, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, {PCI_VENDOR_ID_INIT, 0x9400, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
{PCI_VENDOR_ID_INIT, 0x9401, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, {PCI_VENDOR_ID_INIT, 0x9401, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},

2
drivers/scsi/ipr.c
View File

@ -9844,7 +9844,7 @@ static void ipr_shutdown(struct pci_dev *pdev)
} }
} }
static struct pci_device_id ipr_pci_table[] = { static const struct pci_device_id ipr_pci_table[] = {
{ PCI_VENDOR_ID_MYLEX, PCI_DEVICE_ID_IBM_GEMSTONE, { PCI_VENDOR_ID_MYLEX, PCI_DEVICE_ID_IBM_GEMSTONE,
PCI_VENDOR_ID_IBM, IPR_SUBS_DEV_ID_5702, 0, 0, 0 }, PCI_VENDOR_ID_IBM, IPR_SUBS_DEV_ID_5702, 0, 0, 0 },
{ PCI_VENDOR_ID_MYLEX, PCI_DEVICE_ID_IBM_GEMSTONE, { PCI_VENDOR_ID_MYLEX, PCI_DEVICE_ID_IBM_GEMSTONE,

2
drivers/scsi/megaraid.c
View File

@ -4551,7 +4551,7 @@ megaraid_shutdown(struct pci_dev *pdev)
__megaraid_shutdown(adapter); __megaraid_shutdown(adapter);
} }
static struct pci_device_id megaraid_pci_tbl[] = { static const struct pci_device_id megaraid_pci_tbl[] = {
{PCI_VENDOR_ID_AMI, PCI_DEVICE_ID_AMI_MEGARAID, {PCI_VENDOR_ID_AMI, PCI_DEVICE_ID_AMI_MEGARAID,
PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
{PCI_VENDOR_ID_AMI, PCI_DEVICE_ID_AMI_MEGARAID2, {PCI_VENDOR_ID_AMI, PCI_DEVICE_ID_AMI_MEGARAID2,

2
drivers/scsi/megaraid/megaraid_mbox.c
View File

@ -199,7 +199,7 @@ MODULE_PARM_DESC(debug_level, "Debug level for driver (default=0)");
/* /*
* PCI table for all supported controllers. * PCI table for all supported controllers.
*/ */
static struct pci_device_id pci_id_table_g[] = { static const struct pci_device_id pci_id_table_g[] = {
{ {
PCI_VENDOR_ID_DELL, PCI_VENDOR_ID_DELL,
PCI_DEVICE_ID_PERC4_DI_DISCOVERY, PCI_DEVICE_ID_PERC4_DI_DISCOVERY,

2
drivers/scsi/megaraid/megaraid_sas_base.c
View File

@ -147,7 +147,7 @@ megasas_set_ld_removed_by_fw(struct megasas_instance *instance);
/* /*
* PCI ID table for all supported controllers * PCI ID table for all supported controllers
*/ */
static struct pci_device_id megasas_pci_table[] = { static const struct pci_device_id megasas_pci_table[] = {
{PCI_DEVICE(PCI_VENDOR_ID_LSI_LOGIC, PCI_DEVICE_ID_LSI_SAS1064R)}, {PCI_DEVICE(PCI_VENDOR_ID_LSI_LOGIC, PCI_DEVICE_ID_LSI_SAS1064R)},
/* xscale IOP */ /* xscale IOP */

2
drivers/scsi/mvsas/mv_init.c
View File

@ -609,7 +609,7 @@ static void mvs_pci_remove(struct pci_dev *pdev)
return; return;
} }
static struct pci_device_id mvs_pci_table[] = { static const struct pci_device_id mvs_pci_table[] = {
{ PCI_VDEVICE(MARVELL, 0x6320), chip_6320 }, { PCI_VDEVICE(MARVELL, 0x6320), chip_6320 },
{ PCI_VDEVICE(MARVELL, 0x6340), chip_6440 }, { PCI_VDEVICE(MARVELL, 0x6340), chip_6440 },
{ {

2
drivers/scsi/nsp32.c
View File

@ -66,7 +66,7 @@ static const char *nsp32_release_version = "1.2";
/**************************************************************************** /****************************************************************************
* Supported hardware * Supported hardware
*/ */
static struct pci_device_id nsp32_pci_table[] = { static const struct pci_device_id nsp32_pci_table[] = {
{ {
.vendor = PCI_VENDOR_ID_IODATA, .vendor = PCI_VENDOR_ID_IODATA,
.device = PCI_DEVICE_ID_NINJASCSI_32BI_CBSC_II, .device = PCI_DEVICE_ID_NINJASCSI_32BI_CBSC_II,

2
drivers/scsi/pm8001/pm8001_init.c
View File

@ -1435,7 +1435,7 @@ static int __maybe_unused pm8001_pci_resume(struct device *dev)
/* update of pci device, vendor id and driver data with /* update of pci device, vendor id and driver data with
* unique value for each of the controller * unique value for each of the controller
*/ */
static struct pci_device_id pm8001_pci_table[] = { static const struct pci_device_id pm8001_pci_table[] = {
{ PCI_VDEVICE(PMC_Sierra, 0x8001), chip_8001 }, { PCI_VDEVICE(PMC_Sierra, 0x8001), chip_8001 },
{ PCI_VDEVICE(PMC_Sierra, 0x8006), chip_8006 }, { PCI_VDEVICE(PMC_Sierra, 0x8006), chip_8006 },
{ PCI_VDEVICE(ADAPTEC2, 0x8006), chip_8006 }, { PCI_VDEVICE(ADAPTEC2, 0x8006), chip_8006 },

2
drivers/scsi/pmcraid.c
View File

@ -113,7 +113,7 @@ static struct pmcraid_chip_details pmcraid_chip_cfg[] = {
/* /*
* PCI device ids supported by pmcraid driver * PCI device ids supported by pmcraid driver
*/ */
static struct pci_device_id pmcraid_pci_table[] = { static const struct pci_device_id pmcraid_pci_table[] = {
{ PCI_DEVICE(PCI_VENDOR_ID_PMC, PCI_DEVICE_ID_PMC_MAXRAID), { PCI_DEVICE(PCI_VENDOR_ID_PMC, PCI_DEVICE_ID_PMC_MAXRAID),
0, 0, (kernel_ulong_t)&pmcraid_chip_cfg[0] 0, 0, (kernel_ulong_t)&pmcraid_chip_cfg[0]
}, },

2
drivers/scsi/qedi/qedi_main.c
View File

@ -2869,7 +2869,7 @@ static void qedi_remove(struct pci_dev *pdev)
__qedi_remove(pdev, QEDI_MODE_NORMAL); __qedi_remove(pdev, QEDI_MODE_NORMAL);
} }
static struct pci_device_id qedi_pci_tbl[] = { static const struct pci_device_id qedi_pci_tbl[] = {
{ PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, 0x165E) }, { PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, 0x165E) },
{ PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, 0x8084) }, { PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, 0x8084) },
{ 0 }, { 0 },

2
drivers/scsi/qla1280.c
View File

@ -501,7 +501,7 @@ struct qla_boards {
}; };
/* NOTE: the last argument in each entry is used to index ql1280_board_tbl */ /* NOTE: the last argument in each entry is used to index ql1280_board_tbl */
static struct pci_device_id qla1280_pci_tbl[] = { static const struct pci_device_id qla1280_pci_tbl[] = {
{PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP12160, {PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP12160,
PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
{PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP1020, {PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP1020,

2
drivers/scsi/qla2xxx/qla_os.c
View File

@ -8115,7 +8115,7 @@ static const struct pci_error_handlers qla2xxx_err_handler = {
.reset_done = qla_pci_reset_done, .reset_done = qla_pci_reset_done,
}; };
static struct pci_device_id qla2xxx_pci_tbl[] = { static const struct pci_device_id qla2xxx_pci_tbl[] = {
{ PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP2100) }, { PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP2100) },
{ PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP2200) }, { PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP2200) },
{ PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP2300) }, { PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP2300) },

2
drivers/scsi/qla4xxx/ql4_os.c
View File

@ -9846,7 +9846,7 @@ static const struct pci_error_handlers qla4xxx_err_handler = {
.resume = qla4xxx_pci_resume, .resume = qla4xxx_pci_resume,
}; };
static struct pci_device_id qla4xxx_pci_tbl[] = { static const struct pci_device_id qla4xxx_pci_tbl[] = {
{ {
.vendor = PCI_VENDOR_ID_QLOGIC, .vendor = PCI_VENDOR_ID_QLOGIC,
.device = PCI_DEVICE_ID_QLOGIC_ISP4010, .device = PCI_DEVICE_ID_QLOGIC_ISP4010,

2
drivers/scsi/snic/snic_main.c
View File

@ -21,7 +21,7 @@
#define PCI_DEVICE_ID_CISCO_SNIC 0x0046 #define PCI_DEVICE_ID_CISCO_SNIC 0x0046
/* Supported devices by snic module */ /* Supported devices by snic module */
static struct pci_device_id snic_id_table[] = { static const struct pci_device_id snic_id_table[] = {
{PCI_DEVICE(0x1137, PCI_DEVICE_ID_CISCO_SNIC) }, {PCI_DEVICE(0x1137, PCI_DEVICE_ID_CISCO_SNIC) },
{ 0, } /* end of table */ { 0, } /* end of table */
}; };

2
drivers/scsi/stex.c
View File

@ -1488,7 +1488,7 @@ static const struct scsi_host_template driver_template = {
.dma_boundary = PAGE_SIZE - 1, .dma_boundary = PAGE_SIZE - 1,
}; };
static struct pci_device_id stex_pci_tbl[] = { static const struct pci_device_id stex_pci_tbl[] = {
/* st_shasta */ /* st_shasta */
{ 0x105a, 0x8350, PCI_ANY_ID, PCI_ANY_ID, 0, 0, { 0x105a, 0x8350, PCI_ANY_ID, PCI_ANY_ID, 0, 0,
st_shasta }, /* SuperTrak EX8350/8300/16350/16300 */ st_shasta }, /* SuperTrak EX8350/8300/16350/16300 */

2
drivers/scsi/sym53c8xx_2/sym_glue.c
View File

@ -2031,7 +2031,7 @@ static struct spi_function_template sym2_transport_functions = {
.get_signalling = sym2_get_signalling, .get_signalling = sym2_get_signalling,
}; };
static struct pci_device_id sym2_id_table[] = { static const struct pci_device_id sym2_id_table[] = {
{ PCI_VENDOR_ID_LSI_LOGIC, PCI_DEVICE_ID_NCR_53C810, { PCI_VENDOR_ID_LSI_LOGIC, PCI_DEVICE_ID_NCR_53C810,
PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0UL }, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0UL },
{ PCI_VENDOR_ID_LSI_LOGIC, PCI_DEVICE_ID_NCR_53C820, { PCI_VENDOR_ID_LSI_LOGIC, PCI_DEVICE_ID_NCR_53C820,