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: Denis Bolotin <denis.bolotin@cavium.com>
Signed-off-by: Ariel Elior <ariel.elior@cavium.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/qlogic/qed/qed_main.c b/drivers/net/ethernet/qlogic/qed/qed_main.c
index 9854aa9139afa9ca70303093f2c1dc25147ce418..d1d3787affe86d6216c6f64e34cdf7d4d477075f 100644 (file)
--- 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
index ec0d425766a7819b7d6a81ca2130b97c07e80fcf..1377ad172fb3d6caa0d2c41c1974a896633efacf 100644 (file)
--- a/drivers/net/ethernet/qlogic/qed/qed_mcp.c
+++ b/drivers/net/ethernet/qlogic/qed/qed_mcp.c
@@ -2531,7 +2531,6 @@ err0:
 
 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
index 8a5c988d0c3c96c68be2e31e8fd5fb19beb7850f..dd62c38b3bd3ac996579cc283d44518f2c1513c1 100644 (file)
--- a/drivers/net/ethernet/qlogic/qed/qed_mcp.h
+++ b/drivers/net/ethernet/qlogic/qed/qed_mcp.h
@@ -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);