Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 923b55cf authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'net-Wformat-fixes' 



Florian Fainelli says:

====================
-Wformat fixes

This is a collection of some -Wformat fixes found during build, nothing
critical, but nice to have for people turning on more warnings with
their builds.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents dccd3ab5 abdf47aa

drivers/net/dsa/mv88e6xxx/chip.c

+1 −1
Original line number Diff line number Diff line
@@ -480,7 +480,7 @@ static int mv88e6xxx_irq_poll_setup(struct mv88e6xxx_chip *chip) 
	kthread_init_delayed_work(&chip->irq_poll_work,

				  mv88e6xxx_irq_poll);



	chip->kworker = kthread_create_worker(0, dev_name(chip->dev));

	chip->kworker = kthread_create_worker(0, "%s", dev_name(chip->dev));

	if (IS_ERR(chip->kworker))

		return PTR_ERR(chip->kworker);

drivers/net/dsa/mv88e6xxx/ptp.c

+1 −1
Original line number Diff line number Diff line
@@ -400,7 +400,7 @@ int mv88e6xxx_ptp_setup(struct mv88e6xxx_chip *chip) 


	chip->ptp_clock_info.owner = THIS_MODULE;

	snprintf(chip->ptp_clock_info.name, sizeof(chip->ptp_clock_info.name),

		 dev_name(chip->dev));

		 "%s", dev_name(chip->dev));

	chip->ptp_clock_info.max_adj	= 1000000;



	chip->ptp_clock_info.n_ext_ts	= ptp_ops->n_ext_ts;

drivers/net/ethernet/intel/e1000e/netdev.c

+2 −2
Original line number Diff line number Diff line
@@ -2106,7 +2106,7 @@ static int e1000_request_msix(struct e1000_adapter *adapter) 
	if (strlen(netdev->name) < (IFNAMSIZ - 5))

		snprintf(adapter->rx_ring->name,

			 sizeof(adapter->rx_ring->name) - 1,

			 "%s-rx-0", netdev->name);

			 "%.14s-rx-0", netdev->name);

	else

		memcpy(adapter->rx_ring->name, netdev->name, IFNAMSIZ);

	err = request_irq(adapter->msix_entries[vector].vector,
@@ -2122,7 +2122,7 @@ static int e1000_request_msix(struct e1000_adapter *adapter) 
	if (strlen(netdev->name) < (IFNAMSIZ - 5))

		snprintf(adapter->tx_ring->name,

			 sizeof(adapter->tx_ring->name) - 1,

			 "%s-tx-0", netdev->name);

			 "%.14s-tx-0", netdev->name);

	else

		memcpy(adapter->tx_ring->name, netdev->name, IFNAMSIZ);

	err = request_irq(adapter->msix_entries[vector].vector,

drivers/net/ethernet/mellanox/mlxsw/spectrum.c

+2 −2
Original line number Diff line number Diff line
@@ -2129,7 +2129,7 @@ static void mlxsw_sp_port_get_prio_strings(u8 **p, int prio) 
	int i;



	for (i = 0; i < MLXSW_SP_PORT_HW_PRIO_STATS_LEN; i++) {

		snprintf(*p, ETH_GSTRING_LEN, "%s_%d",

		snprintf(*p, ETH_GSTRING_LEN, "%.29s_%.1d",

			 mlxsw_sp_port_hw_prio_stats[i].str, prio);

		*p += ETH_GSTRING_LEN;

	}
@@ -2140,7 +2140,7 @@ static void mlxsw_sp_port_get_tc_strings(u8 **p, int tc) 
	int i;



	for (i = 0; i < MLXSW_SP_PORT_HW_TC_STATS_LEN; i++) {

		snprintf(*p, ETH_GSTRING_LEN, "%s_%d",

		snprintf(*p, ETH_GSTRING_LEN, "%.29s_%.1d",

			 mlxsw_sp_port_hw_tc_stats[i].str, tc);

		*p += ETH_GSTRING_LEN;

	}

drivers/net/veth.c

+2 −1
Original line number Diff line number Diff line
@@ -115,7 +115,8 @@ static void veth_get_strings(struct net_device *dev, u32 stringset, u8 *buf) 
		p += sizeof(ethtool_stats_keys);

		for (i = 0; i < dev->real_num_rx_queues; i++) {

			for (j = 0; j < VETH_RQ_STATS_LEN; j++) {

				snprintf(p, ETH_GSTRING_LEN, "rx_queue_%u_%s",

				snprintf(p, ETH_GSTRING_LEN,

					 "rx_queue_%u_%.11s",

					 i, veth_rq_stats_desc[j].desc);

				p += ETH_GSTRING_LEN;

			}