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

net: Fix sysfs_format_mac() code duplication. 



It's just a duplicate implementation of "%*phC".  Thanks to Joe
Perches for showing that we had exactly this support in the
lib/vsprintf.c code already.

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 52fe29e4

net/ethernet/eth.c

+1 −20
Original line number Diff line number Diff line
@@ -401,27 +401,8 @@ struct net_device *alloc_etherdev_mqs(int sizeof_priv, unsigned int txqs, 
}

EXPORT_SYMBOL(alloc_etherdev_mqs);



static size_t _format_mac_addr(char *buf, int buflen,

			       const unsigned char *addr, int len)

{

	int i;

	char *cp = buf;



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

		cp += scnprintf(cp, buflen - (cp - buf), "%02x", addr[i]);

		if (i == len - 1)

			break;

		cp += scnprintf(cp, buflen - (cp - buf), ":");

	}

	return cp - buf;

}



ssize_t sysfs_format_mac(char *buf, const unsigned char *addr, int len)

{

	size_t l;



	l = _format_mac_addr(buf, PAGE_SIZE, addr, len);

	l += scnprintf(buf + l, PAGE_SIZE - l, "\n");

	return (ssize_t)l;

	return scnprintf(buf, PAGE_SIZE, "%*phC\n", len, addr);

}

EXPORT_SYMBOL(sysfs_format_mac);