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

Commit b60bfdfe authored by Denis Bolotin's avatar Denis Bolotin Committed by David S. Miller
Browse files

qed: Delete unused parameter p_ptt from mcp APIs 



Since nvm images attributes are cached during driver load, acquiring ptt
is not needed when calling qed_mcp_get_nvm_image().

Signed-off-by: default avatarDenis Bolotin <denis.bolotin@cavium.com>
Signed-off-by: default avatarAriel Elior <ariel.elior@cavium.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 5f0456b4

drivers/net/ethernet/qlogic/qed/qed_main.c

+1 −8
Original line number Diff line number Diff line
@@ -1894,15 +1894,8 @@ static int qed_nvm_get_image(struct qed_dev *cdev, enum qed_nvm_images type, 
			     u8 *buf, u16 len)

{

	struct qed_hwfn *hwfn = QED_LEADING_HWFN(cdev);

	struct qed_ptt *ptt = qed_ptt_acquire(hwfn);

	int rc;



	if (!ptt)

		return -EAGAIN;



	rc = qed_mcp_get_nvm_image(hwfn, ptt, type, buf, len);

	qed_ptt_release(hwfn, ptt);

	return rc;

	return qed_mcp_get_nvm_image(hwfn, type, buf, len);

}



static int qed_set_coalesce(struct qed_dev *cdev, u16 rx_coal, u16 tx_coal,

drivers/net/ethernet/qlogic/qed/qed_mcp.c

+1 −3
Original line number Diff line number Diff line
@@ -2531,7 +2531,6 @@ int qed_mcp_nvm_info_populate(struct qed_hwfn *p_hwfn) 


static int

qed_mcp_get_nvm_image_att(struct qed_hwfn *p_hwfn,

			  struct qed_ptt *p_ptt,

			  enum qed_nvm_images image_id,

			  struct qed_nvm_image_att *p_image_att)

{
@@ -2569,7 +2568,6 @@ qed_mcp_get_nvm_image_att(struct qed_hwfn *p_hwfn, 
}



int qed_mcp_get_nvm_image(struct qed_hwfn *p_hwfn,

			  struct qed_ptt *p_ptt,

			  enum qed_nvm_images image_id,

			  u8 *p_buffer, u32 buffer_len)

{
@@ -2578,7 +2576,7 @@ int qed_mcp_get_nvm_image(struct qed_hwfn *p_hwfn, 


	memset(p_buffer, 0, buffer_len);



	rc = qed_mcp_get_nvm_image_att(p_hwfn, p_ptt, image_id, &image_att);

	rc = qed_mcp_get_nvm_image_att(p_hwfn, image_id, &image_att);

	if (rc)

		return rc;

drivers/net/ethernet/qlogic/qed/qed_mcp.h

+0 −2
Original line number Diff line number Diff line
@@ -486,7 +486,6 @@ struct qed_nvm_image_att { 
 * @brief Allows reading a whole nvram image

 *

 * @param p_hwfn

 * @param p_ptt

 * @param image_id - image requested for reading

 * @param p_buffer - allocated buffer into which to fill data

 * @param buffer_len - length of the allocated buffer.
@@ -494,7 +493,6 @@ struct qed_nvm_image_att { 
 * @return 0 iff p_buffer now contains the nvram image.

 */

int qed_mcp_get_nvm_image(struct qed_hwfn *p_hwfn,

			  struct qed_ptt *p_ptt,

			  enum qed_nvm_images image_id,

			  u8 *p_buffer, u32 buffer_len);