Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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: Jesse Brandeburg <jesse.brandeburg@intel.com>
Tested-by: Andrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>

authored by

Jesse Brandeburg and committed by
Jeff Kirsher
af23635a 71245072

+13 -18
+1 -2
drivers/net/ethernet/intel/ice/ice_base.c
··· 203 203 */ 204 204 static u16 ice_calc_q_handle(struct ice_vsi *vsi, struct ice_ring *ring, u8 tc) 205 205 { 206 - WARN_ONCE(ice_ring_is_xdp(ring) && tc, 207 - "XDP ring can't belong to TC other than 0"); 206 + WARN_ONCE(ice_ring_is_xdp(ring) && tc, "XDP ring can't belong to TC other than 0\n"); 208 207 209 208 /* Idea here for calculation is that we subtract the number of queue 210 209 * count from TC that ring belongs to from it's absolute queue index
+4 -4
drivers/net/ethernet/intel/ice/ice_ethtool.c
··· 673 673 674 674 test_vsi = ice_lb_vsi_setup(pf, pf->hw.port_info); 675 675 if (!test_vsi) { 676 - netdev_err(netdev, "Failed to create a VSI for the loopback test"); 676 + netdev_err(netdev, "Failed to create a VSI for the loopback test\n"); 677 677 return 1; 678 678 } 679 679 ··· 732 732 devm_kfree(dev, tx_frame); 733 733 remove_mac_filters: 734 734 if (ice_remove_mac(&pf->hw, &tmp_list)) 735 - netdev_err(netdev, "Could not remove MAC filter for the test VSI"); 735 + netdev_err(netdev, "Could not remove MAC filter for the test VSI\n"); 736 736 free_mac_list: 737 737 ice_free_fltr_list(dev, &tmp_list); 738 738 lbtest_mac_dis: ··· 745 745 lbtest_vsi_close: 746 746 test_vsi->netdev = NULL; 747 747 if (ice_vsi_release(test_vsi)) 748 - netdev_err(netdev, "Failed to remove the test VSI"); 748 + netdev_err(netdev, "Failed to remove the test VSI\n"); 749 749 750 750 return ret; 751 751 } ··· 835 835 int status = ice_open(netdev); 836 836 837 837 if (status) { 838 - dev_err(dev, "Could not open device %s, err %d", 838 + dev_err(dev, "Could not open device %s, err %d\n", 839 839 pf->int_name, status); 840 840 } 841 841 }
+4 -8
drivers/net/ethernet/intel/ice/ice_main.c
··· 1924 1924 if (if_running && !test_and_set_bit(__ICE_DOWN, vsi->state)) { 1925 1925 ret = ice_down(vsi); 1926 1926 if (ret) { 1927 - NL_SET_ERR_MSG_MOD(extack, 1928 - "Preparing device for XDP attach failed"); 1927 + NL_SET_ERR_MSG_MOD(extack, "Preparing device for XDP attach failed"); 1929 1928 return ret; 1930 1929 } 1931 1930 } ··· 1933 1934 vsi->num_xdp_txq = vsi->alloc_txq; 1934 1935 xdp_ring_err = ice_prepare_xdp_rings(vsi, prog); 1935 1936 if (xdp_ring_err) 1936 - NL_SET_ERR_MSG_MOD(extack, 1937 - "Setting up XDP Tx resources failed"); 1937 + NL_SET_ERR_MSG_MOD(extack, "Setting up XDP Tx resources failed"); 1938 1938 } else if (ice_is_xdp_ena_vsi(vsi) && !prog) { 1939 1939 xdp_ring_err = ice_destroy_xdp_rings(vsi); 1940 1940 if (xdp_ring_err) 1941 - NL_SET_ERR_MSG_MOD(extack, 1942 - "Freeing XDP Tx resources failed"); 1941 + NL_SET_ERR_MSG_MOD(extack, "Freeing XDP Tx resources failed"); 1943 1942 } else { 1944 1943 ice_vsi_assign_bpf_prog(vsi, prog); 1945 1944 } ··· 1970 1973 struct ice_vsi *vsi = np->vsi; 1971 1974 1972 1975 if (vsi->type != ICE_VSI_PF) { 1973 - NL_SET_ERR_MSG_MOD(xdp->extack, 1974 - "XDP can be loaded only on PF VSI"); 1976 + NL_SET_ERR_MSG_MOD(xdp->extack, "XDP can be loaded only on PF VSI"); 1975 1977 return -EINVAL; 1976 1978 } 1977 1979
+1 -1
drivers/net/ethernet/intel/ice/ice_virtchnl_pf.c
··· 2018 2018 2019 2019 status = ice_update_vsi(&pf->hw, vf_vsi->idx, ctx, NULL); 2020 2020 if (status) { 2021 - dev_err(dev, "Failed to %sable spoofchk on VF %d VSI %d\n error %d", 2021 + dev_err(dev, "Failed to %sable spoofchk on VF %d VSI %d\n error %d\n", 2022 2022 ena ? "en" : "dis", vf->vf_id, vf_vsi->vsi_num, status); 2023 2023 ret = -EIO; 2024 2024 goto out;
+3 -3
drivers/net/ethernet/intel/ice/ice_xsk.c
··· 457 457 if (if_running) { 458 458 ret = ice_qp_dis(vsi, qid); 459 459 if (ret) { 460 - netdev_err(vsi->netdev, "ice_qp_dis error = %d", ret); 460 + netdev_err(vsi->netdev, "ice_qp_dis error = %d\n", ret); 461 461 goto xsk_umem_if_up; 462 462 } 463 463 } ··· 471 471 if (!ret && umem_present) 472 472 napi_schedule(&vsi->xdp_rings[qid]->q_vector->napi); 473 473 else if (ret) 474 - netdev_err(vsi->netdev, "ice_qp_ena error = %d", ret); 474 + netdev_err(vsi->netdev, "ice_qp_ena error = %d\n", ret); 475 475 } 476 476 477 477 if (umem_failure) { 478 - netdev_err(vsi->netdev, "Could not %sable UMEM, error = %d", 478 + netdev_err(vsi->netdev, "Could not %sable UMEM, error = %d\n", 479 479 umem_present ? "en" : "dis", umem_failure); 480 480 return umem_failure; 481 481 }