Commit c75a33c8 authored by Jacob Keller's avatar Jacob Keller Committed by David S. Miller
Browse files

net: remove newlines in NL_SET_ERR_MSG_MOD 



The NL_SET_ERR_MSG_MOD macro is used to report a string describing an
error message to userspace via the netlink extended ACK structure. It
should not have a trailing newline.

Add a cocci script which catches cases where the newline marker is
present. Using this script, fix the handful of cases which accidentally
included a trailing new line.

I couldn't figure out a way to get a patch mode working, so this script
only implements context, report, and org.

Signed-off-by: default avatarJacob Keller <jacob.e.keller@intel.com>
Cc: Jakub Kicinski <kuba@kernel.org>
Cc: Andy Whitcroft <apw@canonical.com>
Cc: Joe Perches <joe@perches.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 57ea8506

drivers/net/ethernet/mellanox/mlx5/core/en_tc.c

+1 −1
Original line number Diff line number Diff line
@@ -1097,7 +1097,7 @@ mlx5e_tc_add_nic_flow(struct mlx5e_priv *priv, 
		if (IS_ERR(priv->fs.tc.t)) {

			mutex_unlock(&priv->fs.tc.t_lock);

			NL_SET_ERR_MSG_MOD(extack,

					   "Failed to create tc offload table\n");

					   "Failed to create tc offload table");

			netdev_err(priv->netdev,

				   "Failed to create tc offload table\n");

			return PTR_ERR(priv->fs.tc.t);

drivers/net/ethernet/mscc/ocelot_tc.c

+3 −3
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ static int ocelot_setup_tc_cls_matchall(struct ocelot_port_private *priv, 


		if (priv->tc.police_id && priv->tc.police_id != f->cookie) {

			NL_SET_ERR_MSG_MOD(extack,

					   "Only one policer per port is supported\n");

					   "Only one policer per port is supported");

			return -EEXIST;

		}
@@ -59,7 +59,7 @@ static int ocelot_setup_tc_cls_matchall(struct ocelot_port_private *priv, 


		err = ocelot_port_policer_add(ocelot, port, &pol);

		if (err) {

			NL_SET_ERR_MSG_MOD(extack, "Could not add policer\n");

			NL_SET_ERR_MSG_MOD(extack, "Could not add policer");

			return err;

		}
@@ -73,7 +73,7 @@ static int ocelot_setup_tc_cls_matchall(struct ocelot_port_private *priv, 
		err = ocelot_port_policer_del(ocelot, port);

		if (err) {

			NL_SET_ERR_MSG_MOD(extack,

					   "Could not delete policer\n");

					   "Could not delete policer");

			return err;

		}

		priv->tc.police_id = 0;

net/bridge/br_mrp_netlink.c

+1 −1
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ int br_mrp_parse(struct net_bridge *br, struct net_bridge_port *p, 
	int err;



	if (br->stp_enabled != BR_NO_STP) {

		NL_SET_ERR_MSG_MOD(extack, "MRP can't be enabled if STP is already enabled\n");

		NL_SET_ERR_MSG_MOD(extack, "MRP can't be enabled if STP is already enabled");

		return -EINVAL;

	}

net/bridge/br_stp_if.c

+1 −1
Original line number Diff line number Diff line
@@ -203,7 +203,7 @@ int br_stp_set_enabled(struct net_bridge *br, unsigned long val, 


	if (br_mrp_enabled(br)) {

		NL_SET_ERR_MSG_MOD(extack,

				   "STP can't be enabled if MRP is already enabled\n");

				   "STP can't be enabled if MRP is already enabled");

		return -EINVAL;

	}

net/dsa/slave.c

+3 −3
Original line number Diff line number Diff line
@@ -911,13 +911,13 @@ dsa_slave_add_cls_matchall_police(struct net_device *dev, 


	if (!ds->ops->port_policer_add) {

		NL_SET_ERR_MSG_MOD(extack,

				   "Policing offload not implemented\n");

				   "Policing offload not implemented");

		return -EOPNOTSUPP;

	}



	if (!ingress) {

		NL_SET_ERR_MSG_MOD(extack,

				   "Only supported on ingress qdisc\n");

				   "Only supported on ingress qdisc");

		return -EOPNOTSUPP;

	}
@@ -928,7 +928,7 @@ dsa_slave_add_cls_matchall_police(struct net_device *dev, 
	list_for_each_entry(mall_tc_entry, &p->mall_tc_list, list) {

		if (mall_tc_entry->type == DSA_PORT_MALL_POLICER) {

			NL_SET_ERR_MSG_MOD(extack,

					   "Only one port policer allowed\n");

					   "Only one port policer allowed");

			return -EEXIST;

		}

	}

CRA Git | Maintained and supported by SUSTech CRA and CCSE