Commit 471298ca authored by Bart Van Assche's avatar Bart Van Assche Committed by Martin K. Petersen
Browse files

scsi: qla2xxx: Fix sparse warnings triggered by the PCI state checking code 

This patch fixes the following sparse warnings:

drivers/scsi/qla2xxx/qla_mbx.c:120:21: warning: restricted pci_channel_state_t degrades to integer
drivers/scsi/qla2xxx/qla_mbx.c:120:37: warning: restricted pci_channel_state_t degrades to integer

>From include/linux/pci.h:

enum pci_channel_state {
	/* I/O channel is in normal state */
	pci_channel_io_normal = (__force pci_channel_state_t) 1,

	/* I/O to channel is blocked */
	pci_channel_io_frozen = (__force pci_channel_state_t) 2,

	/* PCI card is dead */
	pci_channel_io_perm_failure = (__force pci_channel_state_t) 3,
};

Link: https://lore.kernel.org/r/20200220043441.20504-4-bvanassche@acm.org


Cc: Roman Bolshakov <r.bolshakov@yadro.com>
Cc: Martin Wilck <mwilck@suse.com>
Cc: Quinn Tran <qutran@marvell.com>
Reviewed-by: default avatarDaniel Wagner <dwagner@suse.de>
Reviewed-by: default avatarRoman Bolshakov <r.bolshakov@yadro.com>
Acked-by: default avatarHimanshu Madhani <hmadhani@marvell.com>
Signed-off-by: default avatarBart Van Assche <bvanassche@acm.org>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 1ee5ac36

drivers/scsi/qla2xxx/qla_mbx.c

+2 −3
Original line number Diff line number Diff line
@@ -117,10 +117,9 @@ qla2x00_mailbox_command(scsi_qla_host_t *vha, mbx_cmd_t *mcp) 


	ql_dbg(ql_dbg_mbx, vha, 0x1000, "Entered %s.\n", __func__);



	if (ha->pdev->error_state > pci_channel_io_frozen) {

	if (ha->pdev->error_state == pci_channel_io_perm_failure) {

		ql_log(ql_log_warn, vha, 0x1001,

		    "error_state is greater than pci_channel_io_frozen, "

		    "exiting.\n");

		    "PCI channel failed permanently, exiting.\n");

		return QLA_FUNCTION_TIMEOUT;

	}

drivers/scsi/qla2xxx/qla_mr.c

+2 −3
Original line number Diff line number Diff line
@@ -53,10 +53,9 @@ qlafx00_mailbox_command(scsi_qla_host_t *vha, struct mbx_cmd_32 *mcp) 
	struct qla_hw_data *ha = vha->hw;

	scsi_qla_host_t *base_vha = pci_get_drvdata(ha->pdev);



	if (ha->pdev->error_state > pci_channel_io_frozen) {

	if (ha->pdev->error_state == pci_channel_io_perm_failure) {

		ql_log(ql_log_warn, vha, 0x115c,

		    "error_state is greater than pci_channel_io_frozen, "

		    "exiting.\n");

		    "PCI channel failed permanently, exiting.\n");

		return QLA_FUNCTION_TIMEOUT;

	}