tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

[SCSI] qla2xxx: Use pci_try_set_mwi().

As the "must-check" return-value of pci_set_msi() is never
really checked.

Signed-off-by: Andrew Vasquez <andrew.vasquez@qlogic.com>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

authored by Andrew Vasquez and committed by James Bottomley af6177d8 f85ec187

+3 -6
unified split
+3 -6
drivers/scsi/qla2xxx/qla_init.c
··· 129 129 int 130 130 qla2100_pci_config(scsi_qla_host_t *ha) 131 131 { 132 - int ret; 133 132 uint16_t w; 134 133 uint32_t d; 135 134 unsigned long flags; 136 135 struct device_reg_2xxx __iomem *reg = &ha->iobase->isp; 137 136 138 137 pci_set_master(ha->pdev); 139 - ret = pci_set_mwi(ha->pdev); 138 + pci_try_set_mwi(ha->pdev); 140 139 141 140 pci_read_config_word(ha->pdev, PCI_COMMAND, &w); 142 141 w |= (PCI_COMMAND_PARITY | PCI_COMMAND_SERR); ··· 163 164 int 164 165 qla2300_pci_config(scsi_qla_host_t *ha) 165 166 { 166 - int ret; 167 167 uint16_t w; 168 168 uint32_t d; 169 169 unsigned long flags = 0; ··· 170 172 struct device_reg_2xxx __iomem *reg = &ha->iobase->isp; 171 173 172 174 pci_set_master(ha->pdev); 173 - ret = pci_set_mwi(ha->pdev); 175 + pci_try_set_mwi(ha->pdev); 174 176 175 177 pci_read_config_word(ha->pdev, PCI_COMMAND, &w); 176 178 w |= (PCI_COMMAND_PARITY | PCI_COMMAND_SERR); ··· 248 250 int 249 251 qla24xx_pci_config(scsi_qla_host_t *ha) 250 252 { 251 - int ret; 252 253 uint16_t w; 253 254 uint32_t d; 254 255 unsigned long flags = 0; 255 256 struct device_reg_24xx __iomem *reg = &ha->iobase->isp24; 256 257 257 258 pci_set_master(ha->pdev); 258 - ret = pci_set_mwi(ha->pdev); 259 + pci_try_set_mwi(ha->pdev); 259 260 260 261 pci_read_config_word(ha->pdev, PCI_COMMAND, &w); 261 262 w |= (PCI_COMMAND_PARITY | PCI_COMMAND_SERR);