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

Commit 532d55d0 authored by Rajesh Borundia's avatar Rajesh Borundia Committed by Sasha Levin
Browse files

qlcnic: Remove unnecessary usage of atomic_t 



[ Upstream commit 5bf93251cee1fb66141d1d2eaff86e04a9397bdf ]

o atomic_t usage is incorrect as we are not implementing
any atomicity.

Signed-off-by: default avatarRajesh Borundia <rajesh.borundia@qlogic.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarSasha Levin <sasha.levin@oracle.com>
parent 3306efbf

drivers/net/ethernet/qlogic/qlcnic/qlcnic.h

+1 −1
Original line number Diff line number Diff line
@@ -1092,7 +1092,7 @@ struct qlcnic_mailbox { 
	unsigned long		status;

	spinlock_t		queue_lock;	/* Mailbox queue lock */

	spinlock_t		aen_lock;	/* Mailbox response/AEN lock */

	atomic_t		rsp_status;

	u32			rsp_status;

	u32			num_cmds;

};

drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c

+4 −5
Original line number Diff line number Diff line
@@ -489,7 +489,7 @@ irqreturn_t qlcnic_83xx_clear_legacy_intr(struct qlcnic_adapter *adapter) 


static inline void qlcnic_83xx_notify_mbx_response(struct qlcnic_mailbox *mbx)

{

	atomic_set(&mbx->rsp_status, QLC_83XX_MBX_RESPONSE_ARRIVED);

	mbx->rsp_status = QLC_83XX_MBX_RESPONSE_ARRIVED;

	complete(&mbx->completion);

}
@@ -508,7 +508,7 @@ static void qlcnic_83xx_poll_process_aen(struct qlcnic_adapter *adapter) 
	if (event &  QLCNIC_MBX_ASYNC_EVENT) {

		__qlcnic_83xx_process_aen(adapter);

	} else {

		if (atomic_read(&mbx->rsp_status) != rsp_status)

		if (mbx->rsp_status != rsp_status)

			qlcnic_83xx_notify_mbx_response(mbx);

	}

out:
@@ -1023,7 +1023,7 @@ static void qlcnic_83xx_process_aen(struct qlcnic_adapter *adapter) 
		if (event &  QLCNIC_MBX_ASYNC_EVENT) {

			__qlcnic_83xx_process_aen(adapter);

		} else {

			if (atomic_read(&mbx->rsp_status) != rsp_status)

			if (mbx->rsp_status != rsp_status)

				qlcnic_83xx_notify_mbx_response(mbx);

		}

	}
@@ -4025,7 +4025,6 @@ static void qlcnic_83xx_mailbox_worker(struct work_struct *work) 
	struct qlcnic_adapter *adapter = mbx->adapter;

	struct qlcnic_mbx_ops *mbx_ops = mbx->ops;

	struct device *dev = &adapter->pdev->dev;

	atomic_t *rsp_status = &mbx->rsp_status;

	struct list_head *head = &mbx->cmd_q;

	struct qlcnic_hardware_context *ahw;

	struct qlcnic_cmd_args *cmd = NULL;
@@ -4038,7 +4037,7 @@ static void qlcnic_83xx_mailbox_worker(struct work_struct *work) 
			return;

		}



		atomic_set(rsp_status, QLC_83XX_MBX_RESPONSE_WAIT);

		mbx->rsp_status = QLC_83XX_MBX_RESPONSE_WAIT;



		spin_lock(&mbx->queue_lock);