net: qed: use ptr shortcuts to dedup field accessing in some parts

[linux-2.6-microblaze.git] / drivers / net / ethernet / qlogic / qed / qed_sp_commands.c

diff --git a/drivers/net/ethernet/qlogic/qed/qed_sp_commands.c b/drivers/net/ethernet/qlogic/qed/qed_sp_commands.c
index 900bc60..71ab57b 100644 (file)
--- a/drivers/net/ethernet/qlogic/qed/qed_sp_commands.c
+++ b/drivers/net/ethernet/qlogic/qed/qed_sp_commands.c
@@ -1,33 +1,7 @@
+// SPDX-License-Identifier: (GPL-2.0-only OR BSD-3-Clause)
 /* QLogic qed NIC Driver
  * Copyright (c) 2015-2017  QLogic Corporation
- *
- * This software is available to you under a choice of one of two
- * licenses.  You may choose to be licensed under the terms of the GNU
- * General Public License (GPL) Version 2, available from the file
- * COPYING in the main directory of this source tree, or the
- * OpenIB.org BSD license below:
- *
- *     Redistribution and use in source and binary forms, with or
- *     without modification, are permitted provided that the following
- *     conditions are met:
- *
- *      - Redistributions of source code must retain the above
- *        copyright notice, this list of conditions and the following
- *        disclaimer.
- *
- *      - Redistributions in binary form must reproduce the above
- *        copyright notice, this list of conditions and the following
- *        disclaimer in the documentation and /or other materials
- *        provided with the distribution.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
- * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
- * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
+ * Copyright (c) 2019-2020 Marvell International Ltd.
  */
 
 #include <linux/types.h>
@@ -326,6 +300,7 @@ int qed_sp_pf_start(struct qed_hwfn *p_hwfn,
                    struct qed_tunnel_info *p_tunn,
                    bool allow_npar_tx_switch)
 {
+       struct outer_tag_config_struct *outer_tag_config;
        struct pf_start_ramrod_data *p_ramrod = NULL;
        u16 sb = qed_int_get_sp_sb_id(p_hwfn);
        u8 sb_index = p_hwfn->p_eq->eq_sb_index;
@@ -362,29 +337,30 @@ int qed_sp_pf_start(struct qed_hwfn *p_hwfn,
        else
                p_ramrod->mf_mode = MF_NPAR;
 
-       p_ramrod->outer_tag_config.outer_tag.tci =
-                               cpu_to_le16(p_hwfn->hw_info.ovlan);
+       outer_tag_config = &p_ramrod->outer_tag_config;
+       outer_tag_config->outer_tag.tci = cpu_to_le16(p_hwfn->hw_info.ovlan);
+
        if (test_bit(QED_MF_8021Q_TAGGING, &p_hwfn->cdev->mf_bits)) {
-               p_ramrod->outer_tag_config.outer_tag.tpid = ETH_P_8021Q;
+               outer_tag_config->outer_tag.tpid = ETH_P_8021Q;
        } else if (test_bit(QED_MF_8021AD_TAGGING, &p_hwfn->cdev->mf_bits)) {
-               p_ramrod->outer_tag_config.outer_tag.tpid = ETH_P_8021AD;
-               p_ramrod->outer_tag_config.enable_stag_pri_change = 1;
+               outer_tag_config->outer_tag.tpid = ETH_P_8021AD;
+               outer_tag_config->enable_stag_pri_change = 1;
        }
 
-       p_ramrod->outer_tag_config.pri_map_valid = 1;
+       outer_tag_config->pri_map_valid = 1;
        for (i = 0; i < QED_MAX_PFC_PRIORITIES; i++)
-               p_ramrod->outer_tag_config.inner_to_outer_pri_map[i] = i;
+               outer_tag_config->inner_to_outer_pri_map[i] = i;
 
        /* enable_stag_pri_change should be set if port is in BD mode or,
         * UFP with Host Control mode.
         */
        if (test_bit(QED_MF_UFP_SPECIFIC, &p_hwfn->cdev->mf_bits)) {
                if (p_hwfn->ufp_info.pri_type == QED_UFP_PRI_OS)
-                       p_ramrod->outer_tag_config.enable_stag_pri_change = 1;
+                       outer_tag_config->enable_stag_pri_change = 1;
                else
-                       p_ramrod->outer_tag_config.enable_stag_pri_change = 0;
+                       outer_tag_config->enable_stag_pri_change = 0;
 
-               p_ramrod->outer_tag_config.outer_tag.tci |=
+               outer_tag_config->outer_tag.tci |=
                    cpu_to_le16(((u16)p_hwfn->ufp_info.tc << 13));
        }
 
@@ -432,7 +408,7 @@ int qed_sp_pf_start(struct qed_hwfn *p_hwfn,
 
        DP_VERBOSE(p_hwfn, QED_MSG_SPQ,
                   "Setting event_ring_sb [id %04x index %02x], outer_tag.tci [%d]\n",
-                  sb, sb_index, p_ramrod->outer_tag_config.outer_tag.tci);
+                  sb, sb_index, outer_tag_config->outer_tag.tci);
 
        rc = qed_spq_post(p_hwfn, p_ent, NULL);