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

Commit 118e2ef9 authored by Bart Van Assche's avatar Bart Van Assche Committed by James Bottomley
Browse files

qla2xxx: Avoid that sparse complains about duplicate [noderef] attributes 



Signed-off-by: default avatarBart Van Assche <bart.vanassche@sandisk.com>
Acked-by: default avatarHimanshu Madhani <himanshu.madhani@qlogic.com>
Signed-off-by: default avatarJames Bottomley <JBottomley@Odin.com>
parent ad950360

drivers/scsi/qla2xxx/qla_dbg.c

+1 −1
Original line number Diff line number Diff line
@@ -627,7 +627,7 @@ qla25xx_copy_mq(struct qla_hw_data *ha, void *ptr, uint32_t **last_chain) 
	uint32_t cnt, que_idx;

	uint8_t que_cnt;

	struct qla2xxx_mq_chain *mq = ptr;

	device_reg_t __iomem *reg;

	device_reg_t *reg;



	if (!ha->mqenable || IS_QLA83XX(ha) || IS_QLA27XX(ha))

		return ptr;

drivers/scsi/qla2xxx/qla_init.c

+1 −1
Original line number Diff line number Diff line
@@ -2085,7 +2085,7 @@ void 
qla24xx_config_rings(struct scsi_qla_host *vha)

{

	struct qla_hw_data *ha = vha->hw;

	device_reg_t __iomem *reg = ISP_QUE_REG(ha, 0);

	device_reg_t *reg = ISP_QUE_REG(ha, 0);

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

	struct qla_msix_entry *msix;

	struct init_cb_24xx *icb;

drivers/scsi/qla2xxx/qla_iocb.c

+2 −2
Original line number Diff line number Diff line
@@ -451,7 +451,7 @@ void 
qla2x00_start_iocbs(struct scsi_qla_host *vha, struct req_que *req)

{

	struct qla_hw_data *ha = vha->hw;

	device_reg_t __iomem *reg = ISP_QUE_REG(ha, req->id);

	device_reg_t *reg = ISP_QUE_REG(ha, req->id);



	if (IS_P3P_TYPE(ha)) {

		qla82xx_start_iocbs(vha);
@@ -1795,7 +1795,7 @@ qla2x00_alloc_iocbs(scsi_qla_host_t *vha, srb_t *sp) 
{

	struct qla_hw_data *ha = vha->hw;

	struct req_que *req = ha->req_q_map[0];

	device_reg_t __iomem *reg = ISP_QUE_REG(ha, req->id);

	device_reg_t *reg = ISP_QUE_REG(ha, req->id);

	uint32_t index, handle;

	request_t *pkt;

	uint16_t cnt, req_cnt;