Commit 3274940b authored by Harvey Hunt's avatar Harvey Hunt Committed by David S. Miller
Browse files

drivers: net: Don't print unpopulated net_device name 



For ethernet devices, net_device.name will be eth%d before
register_netdev() is called. Don't print the net_device name until
the format string is replaced.

Signed-off-by: default avatarHarvey Hunt <harvey.hunt@imgtec.com>
Cc: Marcel Ziswiler <marcel@ziswiler.com>
Cc: Robert Jarzmik <robert.jarzmik@free.fr>
Cc: Barry Song <Baohua.Song@csr.com>
Cc: netdev@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 39651abd

drivers/net/ethernet/davicom/dm9000.c

+7 −4
Original line number Original line Diff line number Diff line
@@ -1432,6 +1432,7 @@ dm9000_probe(struct platform_device *pdev) 
	int reset_gpios;

	int reset_gpios;

	enum of_gpio_flags flags;

	enum of_gpio_flags flags;

	struct regulator *power;

	struct regulator *power;

	bool inv_mac_addr = false;





	power = devm_regulator_get(dev, "vcc");

	power = devm_regulator_get(dev, "vcc");

	if (IS_ERR(power)) {

	if (IS_ERR(power)) {
@@ -1686,9 +1687,7 @@ dm9000_probe(struct platform_device *pdev) 
	}

	}





	if (!is_valid_ether_addr(ndev->dev_addr)) {

	if (!is_valid_ether_addr(ndev->dev_addr)) {

		dev_warn(db->dev, "%s: Invalid ethernet MAC address. Please "

		inv_mac_addr = true;

			 "set using ifconfig\n", ndev->name);



		eth_hw_addr_random(ndev);

		eth_hw_addr_random(ndev);

		mac_src = "random";

		mac_src = "random";

	}

	}
@@ -1697,11 +1696,15 @@ dm9000_probe(struct platform_device *pdev) 
	platform_set_drvdata(pdev, ndev);

	platform_set_drvdata(pdev, ndev);

	ret = register_netdev(ndev);

	ret = register_netdev(ndev);





	if (ret == 0)

	if (ret == 0) {

		if (inv_mac_addr)

			dev_warn(db->dev, "%s: Invalid ethernet MAC address. Please set using ip\n",

				 ndev->name);

		printk(KERN_INFO "%s: dm9000%c at %p,%p IRQ %d MAC: %pM (%s)\n",

		printk(KERN_INFO "%s: dm9000%c at %p,%p IRQ %d MAC: %pM (%s)\n",

		       ndev->name, dm9000_type_to_char(db->type),

		       ndev->name, dm9000_type_to_char(db->type),

		       db->io_addr, db->io_data, ndev->irq,

		       db->io_addr, db->io_data, ndev->irq,

		       ndev->dev_addr, mac_src);

		       ndev->dev_addr, mac_src);

	}

	return 0;

	return 0;





out:

out:

drivers/net/ethernet/micrel/ks8695net.c

+5 −2
Original line number Original line Diff line number Diff line
@@ -1354,6 +1354,7 @@ ks8695_probe(struct platform_device *pdev) 
	struct resource *rxirq_res, *txirq_res, *linkirq_res;

	struct resource *rxirq_res, *txirq_res, *linkirq_res;

	int ret = 0;

	int ret = 0;

	int buff_n;

	int buff_n;

	bool inv_mac_addr = false;

	u32 machigh, maclow;

	u32 machigh, maclow;





	/* Initialise a net_device */

	/* Initialise a net_device */
@@ -1456,8 +1457,7 @@ ks8695_probe(struct platform_device *pdev) 
	ndev->dev_addr[5] = maclow & 0xFF;

	ndev->dev_addr[5] = maclow & 0xFF;





	if (!is_valid_ether_addr(ndev->dev_addr))

	if (!is_valid_ether_addr(ndev->dev_addr))

		dev_warn(ksp->dev, "%s: Invalid ethernet MAC address. Please "

		inv_mac_addr = true;

			 "set using ifconfig\n", ndev->name);





	/* In order to be efficient memory-wise, we allocate both

	/* In order to be efficient memory-wise, we allocate both

	 * rings in one go.

	 * rings in one go.
@@ -1520,6 +1520,9 @@ ks8695_probe(struct platform_device *pdev) 
	ret = register_netdev(ndev);

	ret = register_netdev(ndev);





	if (ret == 0) {

	if (ret == 0) {

		if (inv_mac_addr)

			dev_warn(ksp->dev, "%s: Invalid ethernet MAC address. Please set using ip\n",

				 ndev->name);

		dev_info(ksp->dev, "ks8695 ethernet (%s) MAC: %pM\n",

		dev_info(ksp->dev, "ks8695 ethernet (%s) MAC: %pM\n",

			 ks8695_port_type(ksp), ndev->dev_addr);

			 ks8695_port_type(ksp), ndev->dev_addr);

	} else {

	} else {

drivers/net/ethernet/netx-eth.c

+8 −4
Original line number Original line Diff line number Diff line
@@ -313,7 +313,8 @@ static int netx_eth_enable(struct net_device *ndev) 
{

{

	struct netx_eth_priv *priv = netdev_priv(ndev);

	struct netx_eth_priv *priv = netdev_priv(ndev);

	unsigned int mac4321, mac65;

	unsigned int mac4321, mac65;

	int running, i;

	int running, i, ret;

	bool inv_mac_addr = false;





	ndev->netdev_ops = &netx_eth_netdev_ops;

	ndev->netdev_ops = &netx_eth_netdev_ops;

	ndev->watchdog_timeo = msecs_to_jiffies(5000);

	ndev->watchdog_timeo = msecs_to_jiffies(5000);
@@ -358,15 +359,18 @@ static int netx_eth_enable(struct net_device *ndev) 
	xc_start(priv->xc);

	xc_start(priv->xc);





	if (!is_valid_ether_addr(ndev->dev_addr))

	if (!is_valid_ether_addr(ndev->dev_addr))

		printk("%s: Invalid ethernet MAC address.  Please "

		inv_mac_addr = true;

		       "set using ifconfig\n", ndev->name);





	for (i=2; i<=18; i++)

	for (i=2; i<=18; i++)

		pfifo_push(EMPTY_PTR_FIFO(priv->id),

		pfifo_push(EMPTY_PTR_FIFO(priv->id),

			FIFO_PTR_FRAMENO(i) | FIFO_PTR_SEGMENT(priv->id));

			FIFO_PTR_FRAMENO(i) | FIFO_PTR_SEGMENT(priv->id));





	return register_netdev(ndev);

	ret = register_netdev(ndev);

	if (inv_mac_addr)

		printk("%s: Invalid ethernet MAC address. Please set using ip\n",

		       ndev->name);





	return ret;

}

}





static int netx_eth_drv_probe(struct platform_device *pdev)

static int netx_eth_drv_probe(struct platform_device *pdev)

CRA Git | Maintained and supported by SUSTech CRA and CCSE