qed: Delete unused parameter p_ptt from mcp APIs

Denis Bolotin · davem330 · commit b60bfdfec5b8 · 2018-04-23T12:05:57.000-04:00
Since nvm images attributes are cached during driver load, acquiring ptt
is not needed when calling qed_mcp_get_nvm_image().

Signed-off-by: Denis Bolotin &lt;denis.bolotin@cavium.com&gt;
Signed-off-by: Ariel Elior &lt;ariel.elior@cavium.com&gt;
Signed-off-by: David S. Miller &lt;davem@davemloft.net&gt;
diff --git a/drivers/net/ethernet/qlogic/qed/qed_main.c b/drivers/net/ethernet/qlogic/qed/qed_main.c
@@ -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,
diff --git a/drivers/net/ethernet/qlogic/qed/qed_mcp.c b/drivers/net/ethernet/qlogic/qed/qed_mcp.c
@@ -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;
 
diff --git a/drivers/net/ethernet/qlogic/qed/qed_mcp.h b/drivers/net/ethernet/qlogic/qed/qed_mcp.h
@@ -486,15 +486,13 @@ 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.
  *
  * @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);
 

Original file line number	Diff line number	Diff line change
`@@ -2531,7 +2531,6 @@ int qed_mcp_nvm_info_populate(struct qed_hwfn *p_hwfn)`
`2531`	`2531`
`2532`	`2532`	`static int`
`2533`	`2533`	`qed_mcp_get_nvm_image_att(struct qed_hwfn *p_hwfn,`
`2534`		`- struct qed_ptt *p_ptt,`
`2535`	`2534`	`enum qed_nvm_images image_id,`
`2536`	`2535`	`struct qed_nvm_image_att *p_image_att)`
`2537`	`2536`	`{`
`@@ -2569,7 +2568,6 @@ qed_mcp_get_nvm_image_att(struct qed_hwfn *p_hwfn,`
`2569`	`2568`	`}`
`2570`	`2569`
`2571`	`2570`	`int qed_mcp_get_nvm_image(struct qed_hwfn *p_hwfn,`
`2572`		`- struct qed_ptt *p_ptt,`
`2573`	`2571`	`enum qed_nvm_images image_id,`
`2574`	`2572`	`u8 *p_buffer, u32 buffer_len)`
`2575`	`2573`	`{`
`@@ -2578,7 +2576,7 @@ int qed_mcp_get_nvm_image(struct qed_hwfn *p_hwfn,`
`2578`	`2576`
`2579`	`2577`	`memset(p_buffer, 0, buffer_len);`
`2580`	`2578`
`2581`		`- rc = qed_mcp_get_nvm_image_att(p_hwfn, p_ptt, image_id, &image_att);`
	`2579`	`+ rc = qed_mcp_get_nvm_image_att(p_hwfn, image_id, &image_att);`
`2582`	`2580`	`if (rc)`
`2583`	`2581`	`return rc;`
`2584`	`2582`