Commit af23635a authored by Jesse Brandeburg's avatar Jesse Brandeburg Committed by Jeff Kirsher
Browse files

ice: add backslash-n to strings 



There were several strings found without line feeds, fix
them by adding a line feed, as is typical.  Without this
lotsofmessagescanbejumbledtogether.

This patch has known checkpatch warnings from long lines
for the NL_* messages, because checkpatch doesn't know
how to ignore them.

Signed-off-by: default avatarJesse Brandeburg <jesse.brandeburg@intel.com>
Tested-by: default avatarAndrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent 71245072

drivers/net/ethernet/intel/ice/ice_base.c

+1 −2
Original line number Diff line number Diff line
@@ -203,8 +203,7 @@ static void ice_cfg_itr_gran(struct ice_hw *hw) 
 */

static u16 ice_calc_q_handle(struct ice_vsi *vsi, struct ice_ring *ring, u8 tc)

{

	WARN_ONCE(ice_ring_is_xdp(ring) && tc,

		  "XDP ring can't belong to TC other than 0");

	WARN_ONCE(ice_ring_is_xdp(ring) && tc, "XDP ring can't belong to TC other than 0\n");



	/* Idea here for calculation is that we subtract the number of queue

	 * count from TC that ring belongs to from it's absolute queue index

drivers/net/ethernet/intel/ice/ice_ethtool.c

+4 −4
Original line number Diff line number Diff line
@@ -673,7 +673,7 @@ static u64 ice_loopback_test(struct net_device *netdev) 


	test_vsi = ice_lb_vsi_setup(pf, pf->hw.port_info);

	if (!test_vsi) {

		netdev_err(netdev, "Failed to create a VSI for the loopback test");

		netdev_err(netdev, "Failed to create a VSI for the loopback test\n");

		return 1;

	}
@@ -732,7 +732,7 @@ lbtest_free_frame: 
	devm_kfree(dev, tx_frame);

remove_mac_filters:

	if (ice_remove_mac(&pf->hw, &tmp_list))

		netdev_err(netdev, "Could not remove MAC filter for the test VSI");

		netdev_err(netdev, "Could not remove MAC filter for the test VSI\n");

free_mac_list:

	ice_free_fltr_list(dev, &tmp_list);

lbtest_mac_dis:
@@ -745,7 +745,7 @@ lbtest_rings_dis: 
lbtest_vsi_close:

	test_vsi->netdev = NULL;

	if (ice_vsi_release(test_vsi))

		netdev_err(netdev, "Failed to remove the test VSI");

		netdev_err(netdev, "Failed to remove the test VSI\n");



	return ret;

}
@@ -835,7 +835,7 @@ ice_self_test(struct net_device *netdev, struct ethtool_test *eth_test, 
			int status = ice_open(netdev);



			if (status) {

				dev_err(dev, "Could not open device %s, err %d",

				dev_err(dev, "Could not open device %s, err %d\n",

					pf->int_name, status);

			}

		}

drivers/net/ethernet/intel/ice/ice_main.c

+4 −8
Original line number Diff line number Diff line
@@ -1924,8 +1924,7 @@ ice_xdp_setup_prog(struct ice_vsi *vsi, struct bpf_prog *prog, 
	if (if_running && !test_and_set_bit(__ICE_DOWN, vsi->state)) {

		ret = ice_down(vsi);

		if (ret) {

			NL_SET_ERR_MSG_MOD(extack,

					   "Preparing device for XDP attach failed");

			NL_SET_ERR_MSG_MOD(extack, "Preparing device for XDP attach failed");

			return ret;

		}

	}
@@ -1934,13 +1933,11 @@ ice_xdp_setup_prog(struct ice_vsi *vsi, struct bpf_prog *prog, 
		vsi->num_xdp_txq = vsi->alloc_txq;

		xdp_ring_err = ice_prepare_xdp_rings(vsi, prog);

		if (xdp_ring_err)

			NL_SET_ERR_MSG_MOD(extack,

					   "Setting up XDP Tx resources failed");

			NL_SET_ERR_MSG_MOD(extack, "Setting up XDP Tx resources failed");

	} else if (ice_is_xdp_ena_vsi(vsi) && !prog) {

		xdp_ring_err = ice_destroy_xdp_rings(vsi);

		if (xdp_ring_err)

			NL_SET_ERR_MSG_MOD(extack,

					   "Freeing XDP Tx resources failed");

			NL_SET_ERR_MSG_MOD(extack, "Freeing XDP Tx resources failed");

	} else {

		ice_vsi_assign_bpf_prog(vsi, prog);

	}
@@ -1973,8 +1970,7 @@ static int ice_xdp(struct net_device *dev, struct netdev_bpf *xdp) 
	struct ice_vsi *vsi = np->vsi;



	if (vsi->type != ICE_VSI_PF) {

		NL_SET_ERR_MSG_MOD(xdp->extack,

				   "XDP can be loaded only on PF VSI");

		NL_SET_ERR_MSG_MOD(xdp->extack, "XDP can be loaded only on PF VSI");

		return -EINVAL;

	}

drivers/net/ethernet/intel/ice/ice_virtchnl_pf.c

+1 −1
Original line number Diff line number Diff line
@@ -2018,7 +2018,7 @@ int ice_set_vf_spoofchk(struct net_device *netdev, int vf_id, bool ena) 


	status = ice_update_vsi(&pf->hw, vf_vsi->idx, ctx, NULL);

	if (status) {

		dev_err(dev, "Failed to %sable spoofchk on VF %d VSI %d\n error %d",

		dev_err(dev, "Failed to %sable spoofchk on VF %d VSI %d\n error %d\n",

			ena ? "en" : "dis", vf->vf_id, vf_vsi->vsi_num, status);

		ret = -EIO;

		goto out;

drivers/net/ethernet/intel/ice/ice_xsk.c

+3 −3
Original line number Diff line number Diff line
@@ -457,7 +457,7 @@ int ice_xsk_umem_setup(struct ice_vsi *vsi, struct xdp_umem *umem, u16 qid) 
	if (if_running) {

		ret = ice_qp_dis(vsi, qid);

		if (ret) {

			netdev_err(vsi->netdev, "ice_qp_dis error = %d", ret);

			netdev_err(vsi->netdev, "ice_qp_dis error = %d\n", ret);

			goto xsk_umem_if_up;

		}

	}
@@ -471,11 +471,11 @@ xsk_umem_if_up: 
		if (!ret && umem_present)

			napi_schedule(&vsi->xdp_rings[qid]->q_vector->napi);

		else if (ret)

			netdev_err(vsi->netdev, "ice_qp_ena error = %d", ret);

			netdev_err(vsi->netdev, "ice_qp_ena error = %d\n", ret);

	}



	if (umem_failure) {

		netdev_err(vsi->netdev, "Could not %sable UMEM, error = %d",

		netdev_err(vsi->netdev, "Could not %sable UMEM, error = %d\n",

			   umem_present ? "en" : "dis", umem_failure);

		return umem_failure;

	}

CRA Git | Maintained and supported by SUSTech CRA and CCSE