Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit af6177d8 authored by Andrew Vasquez's avatar Andrew Vasquez Committed by James Bottomley
Browse files

[SCSI] qla2xxx: Use pci_try_set_mwi(). 



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

Signed-off-by: default avatarAndrew Vasquez <andrew.vasquez@qlogic.com>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@SteelEye.com>
parent f85ec187

drivers/scsi/qla2xxx/qla_init.c

+3 −6
Original line number Diff line number Diff line
@@ -129,14 +129,13 @@ qla2x00_initialize_adapter(scsi_qla_host_t *ha) 
int

qla2100_pci_config(scsi_qla_host_t *ha)

{

	int ret;

	uint16_t w;

	uint32_t d;

	unsigned long flags;

	struct device_reg_2xxx __iomem *reg = &ha->iobase->isp;



	pci_set_master(ha->pdev);

	ret = pci_set_mwi(ha->pdev);

	pci_try_set_mwi(ha->pdev);



	pci_read_config_word(ha->pdev, PCI_COMMAND, &w);

	w |= (PCI_COMMAND_PARITY | PCI_COMMAND_SERR);
@@ -164,7 +163,6 @@ qla2100_pci_config(scsi_qla_host_t *ha) 
int

qla2300_pci_config(scsi_qla_host_t *ha)

{

	int		ret;

	uint16_t	w;

	uint32_t	d;

	unsigned long   flags = 0;
@@ -172,7 +170,7 @@ qla2300_pci_config(scsi_qla_host_t *ha) 
	struct device_reg_2xxx __iomem *reg = &ha->iobase->isp;



	pci_set_master(ha->pdev);

	ret = pci_set_mwi(ha->pdev);

	pci_try_set_mwi(ha->pdev);



	pci_read_config_word(ha->pdev, PCI_COMMAND, &w);

	w |= (PCI_COMMAND_PARITY | PCI_COMMAND_SERR);
@@ -250,14 +248,13 @@ qla2300_pci_config(scsi_qla_host_t *ha) 
int

qla24xx_pci_config(scsi_qla_host_t *ha)

{

	int ret;

	uint16_t w;

	uint32_t d;

	unsigned long flags = 0;

	struct device_reg_24xx __iomem *reg = &ha->iobase->isp24;



	pci_set_master(ha->pdev);

	ret = pci_set_mwi(ha->pdev);

	pci_try_set_mwi(ha->pdev);



	pci_read_config_word(ha->pdev, PCI_COMMAND, &w);

	w |= (PCI_COMMAND_PARITY | PCI_COMMAND_SERR);