Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/1234514/?format=api
{ "id": 1234514, "url": "http://patchwork.ozlabs.org/api/patches/1234514/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/20200206092013.23388-11-anthony.l.nguyen@intel.com/", "project": { "id": 46, "url": "http://patchwork.ozlabs.org/api/projects/46/?format=api", "name": "Intel Wired Ethernet development", "link_name": "intel-wired-lan", "list_id": "intel-wired-lan.osuosl.org", "list_email": "intel-wired-lan@osuosl.org", "web_url": "", "scm_url": "", "webscm_url": "", "list_archive_url": "", "list_archive_url_format": "", "commit_url_format": "" }, "msgid": "<20200206092013.23388-11-anthony.l.nguyen@intel.com>", "list_archive_url": null, "date": "2020-02-06T09:20:09", "name": "[S37,v3,11/15] ice: Use ice_pf_to_dev", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "6bed392442743e97503c7d2693e559df064cd491", "submitter": { "id": 68875, "url": "http://patchwork.ozlabs.org/api/people/68875/?format=api", "name": "Tony Nguyen", "email": "anthony.l.nguyen@intel.com" }, "delegate": { "id": 68, "url": "http://patchwork.ozlabs.org/api/users/68/?format=api", "username": "jtkirshe", "first_name": "Jeff", "last_name": "Kirsher", "email": "jeffrey.t.kirsher@intel.com" }, "mbox": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/20200206092013.23388-11-anthony.l.nguyen@intel.com/mbox/", "series": [ { "id": 157176, "url": "http://patchwork.ozlabs.org/api/series/157176/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/list/?series=157176", "date": "2020-02-06T09:20:02", "name": "[S37,v3,01/15] ice: Fix DCB rebuild after reset", "version": 3, "mbox": "http://patchwork.ozlabs.org/series/157176/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/1234514/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/1234514/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<intel-wired-lan-bounces@osuosl.org>", "X-Original-To": [ "incoming@patchwork.ozlabs.org", "intel-wired-lan@lists.osuosl.org" ], "Delivered-To": [ "patchwork-incoming@bilbo.ozlabs.org", "intel-wired-lan@lists.osuosl.org" ], "Authentication-Results": [ "ozlabs.org; spf=pass (sender SPF authorized)\n\tsmtp.mailfrom=osuosl.org (client-ip=140.211.166.137;\n\thelo=fraxinus.osuosl.org;\n\tenvelope-from=intel-wired-lan-bounces@osuosl.org;\n\treceiver=<UNKNOWN>)", "ozlabs.org;\n\tdmarc=fail (p=none dis=none) header.from=intel.com" ], "Received": [ "from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137])\n\t(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256\n\tbits)) (No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 48D5dB5tvYz9sRR\n\tfor <incoming@patchwork.ozlabs.org>;\n\tFri, 7 Feb 2020 04:53:18 +1100 (AEDT)", "from localhost (localhost [127.0.0.1])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id 61F1486169;\n\tThu, 6 Feb 2020 17:53:17 +0000 (UTC)", "from fraxinus.osuosl.org ([127.0.0.1])\n\tby localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024)\n\twith ESMTP id elyhCk9wyhnE; Thu, 6 Feb 2020 17:53:16 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id 3579486160;\n\tThu, 6 Feb 2020 17:53:16 +0000 (UTC)", "from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137])\n\tby ash.osuosl.org (Postfix) with ESMTP id 166F91BF326\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tThu, 6 Feb 2020 17:53:10 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id 134FA860F9\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tThu, 6 Feb 2020 17:53:10 +0000 (UTC)", "from fraxinus.osuosl.org ([127.0.0.1])\n\tby localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024)\n\twith ESMTP id F6GPQSIxNARF for <intel-wired-lan@lists.osuosl.org>;\n\tThu, 6 Feb 2020 17:53:09 +0000 (UTC)", "from mga04.intel.com (mga04.intel.com [192.55.52.120])\n\tby fraxinus.osuosl.org (Postfix) with ESMTPS id 1A666860F2\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tThu, 6 Feb 2020 17:53:08 +0000 (UTC)", "from fmsmga004.fm.intel.com ([10.253.24.48])\n\tby fmsmga104.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384;\n\t06 Feb 2020 09:53:07 -0800", "from unknown (HELO localhost.jf.intel.com) ([10.166.244.174])\n\tby fmsmga004.fm.intel.com with ESMTP; 06 Feb 2020 09:53:07 -0800" ], "X-Virus-Scanned": [ "amavisd-new at osuosl.org", "amavisd-new at osuosl.org" ], "X-Greylist": "domain auto-whitelisted by SQLgrey-1.7.6", "X-Amp-Result": "SKIPPED(no attachment in message)", "X-Amp-File-Uploaded": "False", "X-ExtLoop1": "1", "X-IronPort-AV": "E=Sophos;i=\"5.70,410,1574150400\"; d=\"scan'208\";a=\"255160939\"", "From": "Tony Nguyen <anthony.l.nguyen@intel.com>", "To": "intel-wired-lan@lists.osuosl.org", "Date": "Thu, 6 Feb 2020 01:20:09 -0800", "Message-Id": "<20200206092013.23388-11-anthony.l.nguyen@intel.com>", "X-Mailer": "git-send-email 2.20.1", "In-Reply-To": "<20200206092013.23388-1-anthony.l.nguyen@intel.com>", "References": "<20200206092013.23388-1-anthony.l.nguyen@intel.com>", "MIME-Version": "1.0", "Subject": "[Intel-wired-lan] [PATCH S37 v3 11/15] ice: Use ice_pf_to_dev", "X-BeenThere": "intel-wired-lan@osuosl.org", "X-Mailman-Version": "2.1.29", "Precedence": "list", "List-Id": "Intel Wired Ethernet Linux Kernel Driver Development\n\t<intel-wired-lan.osuosl.org>", "List-Unsubscribe": "<https://lists.osuosl.org/mailman/options/intel-wired-lan>, \n\t<mailto:intel-wired-lan-request@osuosl.org?subject=unsubscribe>", "List-Archive": "<http://lists.osuosl.org/pipermail/intel-wired-lan/>", "List-Post": "<mailto:intel-wired-lan@osuosl.org>", "List-Help": "<mailto:intel-wired-lan-request@osuosl.org?subject=help>", "List-Subscribe": "<https://lists.osuosl.org/mailman/listinfo/intel-wired-lan>, \n\t<mailto:intel-wired-lan-request@osuosl.org?subject=subscribe>", "Content-Type": "text/plain; charset=\"us-ascii\"", "Content-Transfer-Encoding": "7bit", "Errors-To": "intel-wired-lan-bounces@osuosl.org", "Sender": "\"Intel-wired-lan\" <intel-wired-lan-bounces@osuosl.org>" }, "content": "From: Anirudh Venkataramanan <anirudh.venkataramanan@intel.com>\n\nUse ice_pf_to_dev(pf) instead of &pf->pdev->dev\nUse ice_pf_to_dev(vsi->back) instead of &vsi->back->pdev->dev\nWhen a pointer to the pf instance is available, use ice_pf_to_dev\ninstead of ice_hw_to_dev\n\nSigned-off-by: Anirudh Venkataramanan <anirudh.venkataramanan@intel.com>\n---\n drivers/net/ethernet/intel/ice/ice_base.c | 12 ++++++------\n drivers/net/ethernet/intel/ice/ice_dcb_nl.c | 2 +-\n drivers/net/ethernet/intel/ice/ice_ethtool.c | 2 +-\n drivers/net/ethernet/intel/ice/ice_lib.c | 14 +++++++-------\n drivers/net/ethernet/intel/ice/ice_main.c | 16 ++++++++--------\n drivers/net/ethernet/intel/ice/ice_virtchnl_pf.c | 8 ++++----\n 6 files changed, 27 insertions(+), 27 deletions(-)", "diff": "diff --git a/drivers/net/ethernet/intel/ice/ice_base.c b/drivers/net/ethernet/intel/ice/ice_base.c\nindex d8e975cceb21..8c7d08e2916e 100644\n--- a/drivers/net/ethernet/intel/ice/ice_base.c\n+++ b/drivers/net/ethernet/intel/ice/ice_base.c\n@@ -324,7 +324,7 @@ int ice_setup_rx_ctx(struct ice_ring *ring)\n \t\t\tif (err)\n \t\t\t\treturn err;\n \n-\t\t\tdev_info(&vsi->back->pdev->dev, \"Registered XDP mem model MEM_TYPE_ZERO_COPY on Rx ring %d\\n\",\n+\t\t\tdev_info(ice_pf_to_dev(vsi->back), \"Registered XDP mem model MEM_TYPE_ZERO_COPY on Rx ring %d\\n\",\n \t\t\t\t ring->q_index);\n \t\t} else {\n \t\t\tring->zca.free = NULL;\n@@ -405,7 +405,7 @@ int ice_setup_rx_ctx(struct ice_ring *ring)\n \t/* Absolute queue number out of 2K needs to be passed */\n \terr = ice_write_rxq_ctx(hw, &rlan_ctx, pf_q);\n \tif (err) {\n-\t\tdev_err(&vsi->back->pdev->dev,\n+\t\tdev_err(ice_pf_to_dev(vsi->back),\n \t\t\t\"Failed to set LAN Rx queue context for absolute Rx queue %d error: %d\\n\",\n \t\t\tpf_q, err);\n \t\treturn -EIO;\n@@ -428,7 +428,7 @@ int ice_setup_rx_ctx(struct ice_ring *ring)\n \t ice_alloc_rx_bufs_slow_zc(ring, ICE_DESC_UNUSED(ring)) :\n \t ice_alloc_rx_bufs(ring, ICE_DESC_UNUSED(ring));\n \tif (err)\n-\t\tdev_info(&vsi->back->pdev->dev,\n+\t\tdev_info(ice_pf_to_dev(vsi->back),\n \t\t\t \"Failed allocate some buffers on %sRx ring %d (pf_q %d)\\n\",\n \t\t\t ring->xsk_umem ? \"UMEM enabled \" : \"\",\n \t\t\t ring->q_index, pf_q);\n@@ -815,13 +815,13 @@ ice_vsi_stop_tx_ring(struct ice_vsi *vsi, enum ice_disq_rst_src rst_src,\n \t * queues at the hardware level anyway.\n \t */\n \tif (status == ICE_ERR_RESET_ONGOING) {\n-\t\tdev_dbg(&vsi->back->pdev->dev,\n+\t\tdev_dbg(ice_pf_to_dev(vsi->back),\n \t\t\t\"Reset in progress. LAN Tx queues already disabled\\n\");\n \t} else if (status == ICE_ERR_DOES_NOT_EXIST) {\n-\t\tdev_dbg(&vsi->back->pdev->dev,\n+\t\tdev_dbg(ice_pf_to_dev(vsi->back),\n \t\t\t\"LAN Tx queues do not exist, nothing to disable\\n\");\n \t} else if (status) {\n-\t\tdev_err(&vsi->back->pdev->dev,\n+\t\tdev_err(ice_pf_to_dev(vsi->back),\n \t\t\t\"Failed to disable LAN Tx queues, error: %d\\n\", status);\n \t\treturn -ENODEV;\n \t}\ndiff --git a/drivers/net/ethernet/intel/ice/ice_dcb_nl.c b/drivers/net/ethernet/intel/ice/ice_dcb_nl.c\nindex 926c9772f086..265cf69b321b 100644\n--- a/drivers/net/ethernet/intel/ice/ice_dcb_nl.c\n+++ b/drivers/net/ethernet/intel/ice/ice_dcb_nl.c\n@@ -882,7 +882,7 @@ ice_dcbnl_vsi_del_app(struct ice_vsi *vsi,\n \tsapp.protocol = app->prot_id;\n \tsapp.priority = app->priority;\n \terr = ice_dcbnl_delapp(vsi->netdev, &sapp);\n-\tdev_dbg(&vsi->back->pdev->dev,\n+\tdev_dbg(ice_pf_to_dev(vsi->back),\n \t\t\"Deleting app for VSI idx=%d err=%d sel=%d proto=0x%x, prio=%d\\n\",\n \t\tvsi->idx, err, app->selector, app->prot_id, app->priority);\n }\ndiff --git a/drivers/net/ethernet/intel/ice/ice_ethtool.c b/drivers/net/ethernet/intel/ice/ice_ethtool.c\nindex 7539fd8147de..8110da94c979 100644\n--- a/drivers/net/ethernet/intel/ice/ice_ethtool.c\n+++ b/drivers/net/ethernet/intel/ice/ice_ethtool.c\n@@ -1058,7 +1058,7 @@ ice_set_fecparam(struct net_device *netdev, struct ethtool_fecparam *fecparam)\n \t\tfec = ICE_FEC_NONE;\n \t\tbreak;\n \tdefault:\n-\t\tdev_warn(&vsi->back->pdev->dev, \"Unsupported FEC mode: %d\\n\",\n+\t\tdev_warn(ice_pf_to_dev(vsi->back), \"Unsupported FEC mode: %d\\n\",\n \t\t\t fecparam->fec);\n \t\treturn -EINVAL;\n \t}\ndiff --git a/drivers/net/ethernet/intel/ice/ice_lib.c b/drivers/net/ethernet/intel/ice/ice_lib.c\nindex 37ff98da5ca8..ac06f0141740 100644\n--- a/drivers/net/ethernet/intel/ice/ice_lib.c\n+++ b/drivers/net/ethernet/intel/ice/ice_lib.c\n@@ -117,7 +117,7 @@ static void ice_vsi_set_num_desc(struct ice_vsi *vsi)\n \t\tvsi->num_tx_desc = ICE_DFLT_NUM_TX_DESC;\n \t\tbreak;\n \tdefault:\n-\t\tdev_dbg(&vsi->back->pdev->dev,\n+\t\tdev_dbg(ice_pf_to_dev(vsi->back),\n \t\t\t\"Not setting number of Tx/Rx descriptors for VSI type %d\\n\",\n \t\t\tvsi->type);\n \t\tbreak;\n@@ -735,7 +735,7 @@ static void ice_vsi_setup_q_map(struct ice_vsi *vsi, struct ice_vsi_ctx *ctxt)\n \tvsi->num_txq = tx_count;\n \n \tif (vsi->type == ICE_VSI_VF && vsi->num_txq != vsi->num_rxq) {\n-\t\tdev_dbg(&vsi->back->pdev->dev, \"VF VSI should have same number of Tx and Rx queues. Hence making them equal\\n\");\n+\t\tdev_dbg(ice_pf_to_dev(vsi->back), \"VF VSI should have same number of Tx and Rx queues. Hence making them equal\\n\");\n \t\t/* since there is a chance that num_rxq could have been changed\n \t\t * in the above for loop, make num_txq equal to num_rxq.\n \t\t */\n@@ -1488,7 +1488,7 @@ int ice_vsi_cfg_rxqs(struct ice_vsi *vsi)\n \n \t\terr = ice_setup_rx_ctx(vsi->rx_rings[i]);\n \t\tif (err) {\n-\t\t\tdev_err(&vsi->back->pdev->dev,\n+\t\t\tdev_err(ice_pf_to_dev(vsi->back),\n \t\t\t\t\"ice_setup_rx_ctx failed for RxQ %d, err %d\\n\",\n \t\t\t\ti, err);\n \t\t\treturn err;\n@@ -1658,7 +1658,7 @@ int ice_vsi_manage_vlan_insertion(struct ice_vsi *vsi)\n \n \tstatus = ice_update_vsi(hw, vsi->idx, ctxt, NULL);\n \tif (status) {\n-\t\tdev_err(&vsi->back->pdev->dev, \"update VSI for VLAN insert failed, err %d aq_err %d\\n\",\n+\t\tdev_err(ice_pf_to_dev(vsi->back), \"update VSI for VLAN insert failed, err %d aq_err %d\\n\",\n \t\t\tstatus, hw->adminq.sq_last_status);\n \t\tret = -EIO;\n \t\tgoto out;\n@@ -1704,7 +1704,7 @@ int ice_vsi_manage_vlan_stripping(struct ice_vsi *vsi, bool ena)\n \n \tstatus = ice_update_vsi(hw, vsi->idx, ctxt, NULL);\n \tif (status) {\n-\t\tdev_err(&vsi->back->pdev->dev, \"update VSI for VLAN strip failed, ena = %d err %d aq_err %d\\n\",\n+\t\tdev_err(ice_pf_to_dev(vsi->back), \"update VSI for VLAN strip failed, ena = %d err %d aq_err %d\\n\",\n \t\t\tena, status, hw->adminq.sq_last_status);\n \t\tret = -EIO;\n \t\tgoto out;\n@@ -1869,7 +1869,7 @@ ice_vsi_set_q_vectors_reg_idx(struct ice_vsi *vsi)\n \t\tstruct ice_q_vector *q_vector = vsi->q_vectors[i];\n \n \t\tif (!q_vector) {\n-\t\t\tdev_err(&vsi->back->pdev->dev,\n+\t\t\tdev_err(ice_pf_to_dev(vsi->back),\n \t\t\t\t\"Failed to set reg_idx on q_vector %d VSI %d\\n\",\n \t\t\t\ti, vsi->vsi_num);\n \t\t\tgoto clear_reg_idx;\n@@ -3011,7 +3011,7 @@ ice_vsi_cfg_mac_fltr(struct ice_vsi *vsi, const u8 *macaddr, bool set)\n \t\tstatus = ice_remove_mac(&vsi->back->hw, &tmp_add_list);\n \n cfg_mac_fltr_exit:\n-\tice_free_fltr_list(&vsi->back->pdev->dev, &tmp_add_list);\n+\tice_free_fltr_list(ice_pf_to_dev(vsi->back), &tmp_add_list);\n \treturn status;\n }\n \ndiff --git a/drivers/net/ethernet/intel/ice/ice_main.c b/drivers/net/ethernet/intel/ice/ice_main.c\nindex f3ca72a19d03..3a05f9e3b86e 100644\n--- a/drivers/net/ethernet/intel/ice/ice_main.c\n+++ b/drivers/net/ethernet/intel/ice/ice_main.c\n@@ -269,7 +269,7 @@ static int ice_cfg_promisc(struct ice_vsi *vsi, u8 promisc_m, bool set_promisc)\n */\n static int ice_vsi_sync_fltr(struct ice_vsi *vsi)\n {\n-\tstruct device *dev = &vsi->back->pdev->dev;\n+\tstruct device *dev = ice_pf_to_dev(vsi->back);\n \tstruct net_device *netdev = vsi->netdev;\n \tbool promisc_forced_on = false;\n \tstruct ice_pf *pf = vsi->back;\n@@ -1371,7 +1371,7 @@ static int ice_force_phys_link_state(struct ice_vsi *vsi, bool link_up)\n \tif (vsi->type != ICE_VSI_PF)\n \t\treturn 0;\n \n-\tdev = &vsi->back->pdev->dev;\n+\tdev = ice_pf_to_dev(vsi->back);\n \n \tpi = vsi->port_info;\n \n@@ -1692,7 +1692,7 @@ static int ice_vsi_req_irq_msix(struct ice_vsi *vsi, char *basename)\n */\n static int ice_xdp_alloc_setup_rings(struct ice_vsi *vsi)\n {\n-\tstruct device *dev = &vsi->back->pdev->dev;\n+\tstruct device *dev = ice_pf_to_dev(vsi->back);\n \tint i;\n \n \tfor (i = 0; i < vsi->num_xdp_txq; i++) {\n@@ -3933,14 +3933,14 @@ ice_set_features(struct net_device *netdev, netdev_features_t features)\n \n \t/* Don't set any netdev advanced features with device in Safe Mode */\n \tif (ice_is_safe_mode(vsi->back)) {\n-\t\tdev_err(&vsi->back->pdev->dev,\n+\t\tdev_err(ice_pf_to_dev(vsi->back),\n \t\t\t\"Device is in Safe Mode - not enabling advanced netdev features\\n\");\n \t\treturn ret;\n \t}\n \n \t/* Do not change setting during reset */\n \tif (ice_is_reset_in_progress(pf->state)) {\n-\t\tdev_err(&vsi->back->pdev->dev,\n+\t\tdev_err(ice_pf_to_dev(vsi->back),\n \t\t\t\"Device is resetting, changing advanced netdev features temporarily unavailable.\\n\");\n \t\treturn -EBUSY;\n \t}\n@@ -4483,7 +4483,7 @@ int ice_vsi_setup_tx_rings(struct ice_vsi *vsi)\n \tint i, err = 0;\n \n \tif (!vsi->num_txq) {\n-\t\tdev_err(&vsi->back->pdev->dev, \"VSI %d has 0 Tx queues\\n\",\n+\t\tdev_err(ice_pf_to_dev(vsi->back), \"VSI %d has 0 Tx queues\\n\",\n \t\t\tvsi->vsi_num);\n \t\treturn -EINVAL;\n \t}\n@@ -4514,7 +4514,7 @@ int ice_vsi_setup_rx_rings(struct ice_vsi *vsi)\n \tint i, err = 0;\n \n \tif (!vsi->num_rxq) {\n-\t\tdev_err(&vsi->back->pdev->dev, \"VSI %d has 0 Rx queues\\n\",\n+\t\tdev_err(ice_pf_to_dev(vsi->back), \"VSI %d has 0 Rx queues\\n\",\n \t\t\tvsi->vsi_num);\n \t\treturn -EINVAL;\n \t}\n@@ -5073,7 +5073,7 @@ static int ice_vsi_update_bridge_mode(struct ice_vsi *vsi, u16 bmode)\n \n \tstatus = ice_update_vsi(hw, vsi->idx, ctxt, NULL);\n \tif (status) {\n-\t\tdev_err(&vsi->back->pdev->dev, \"update VSI for bridge mode failed, bmode = %d err %d aq_err %d\\n\",\n+\t\tdev_err(ice_pf_to_dev(vsi->back), \"update VSI for bridge mode failed, bmode = %d err %d aq_err %d\\n\",\n \t\t\tbmode, status, hw->adminq.sq_last_status);\n \t\tret = -EIO;\n \t\tgoto out;\ndiff --git a/drivers/net/ethernet/intel/ice/ice_virtchnl_pf.c b/drivers/net/ethernet/intel/ice/ice_virtchnl_pf.c\nindex d8016d104ca4..a287068c5274 100644\n--- a/drivers/net/ethernet/intel/ice/ice_virtchnl_pf.c\n+++ b/drivers/net/ethernet/intel/ice/ice_virtchnl_pf.c\n@@ -462,7 +462,7 @@ static int ice_vsi_manage_pvid(struct ice_vsi *vsi, u16 vid, bool enable)\n \n \tstatus = ice_update_vsi(hw, vsi->idx, ctxt, NULL);\n \tif (status) {\n-\t\tdev_info(&vsi->back->pdev->dev, \"update VSI for port VLAN failed, err %d aq_err %d\\n\",\n+\t\tdev_info(ice_pf_to_dev(vsi->back), \"update VSI for port VLAN failed, err %d aq_err %d\\n\",\n \t\t\t status, hw->adminq.sq_last_status);\n \t\tret = -EIO;\n \t\tgoto out;\n@@ -2038,7 +2038,7 @@ static int ice_vc_ena_qs_msg(struct ice_vf *vf, u8 *msg)\n \t\t\tcontinue;\n \n \t\tif (ice_vsi_ctrl_rx_ring(vsi, true, vf_q_id)) {\n-\t\t\tdev_err(&vsi->back->pdev->dev,\n+\t\t\tdev_err(ice_pf_to_dev(vsi->back),\n \t\t\t\t\"Failed to enable Rx ring %d on VSI %d\\n\",\n \t\t\t\tvf_q_id, vsi->vsi_num);\n \t\t\tv_ret = VIRTCHNL_STATUS_ERR_PARAM;\n@@ -2141,7 +2141,7 @@ static int ice_vc_dis_qs_msg(struct ice_vf *vf, u8 *msg)\n \n \t\t\tif (ice_vsi_stop_tx_ring(vsi, ICE_NO_RESET, vf->vf_id,\n \t\t\t\t\t\t ring, &txq_meta)) {\n-\t\t\t\tdev_err(&vsi->back->pdev->dev,\n+\t\t\t\tdev_err(ice_pf_to_dev(vsi->back),\n \t\t\t\t\t\"Failed to stop Tx ring %d on VSI %d\\n\",\n \t\t\t\t\tvf_q_id, vsi->vsi_num);\n \t\t\t\tv_ret = VIRTCHNL_STATUS_ERR_PARAM;\n@@ -2168,7 +2168,7 @@ static int ice_vc_dis_qs_msg(struct ice_vf *vf, u8 *msg)\n \t\t\t\tcontinue;\n \n \t\t\tif (ice_vsi_ctrl_rx_ring(vsi, false, vf_q_id)) {\n-\t\t\t\tdev_err(&vsi->back->pdev->dev,\n+\t\t\t\tdev_err(ice_pf_to_dev(vsi->back),\n \t\t\t\t\t\"Failed to stop Rx ring %d on VSI %d\\n\",\n \t\t\t\t\tvf_q_id, vsi->vsi_num);\n \t\t\t\tv_ret = VIRTCHNL_STATUS_ERR_PARAM;\n", "prefixes": [ "S37", "v3", "11/15" ] }