Skip to content

Commit

Permalink
net: encx24j600: move rev announcement to probe function
Browse files Browse the repository at this point in the history
When encx24j600 is open and closed many times due to userspace polling the
interface, the log gets noise with this log message.

Moving this to encx24j600_spi_probe function where it belongs.

Signed-off-by: Jon Ringle <jringle@gridpoint.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Jon Ringle authored and David S. Miller committed Nov 20, 2015
1 parent 85c72ba commit 7b5dc0d
Showing 1 changed file with 12 additions and 12 deletions.
24 changes: 12 additions & 12 deletions drivers/net/ethernet/microchip/encx24j600.c
Original file line number Diff line number Diff line change
Expand Up @@ -600,22 +600,11 @@ static void encx24j600_set_rxfilter_mode(struct encx24j600_priv *priv)

static int encx24j600_hw_init(struct encx24j600_priv *priv)
{
struct net_device *dev = priv->ndev;
int ret = 0;
u16 eidled;
u16 macon2;

priv->hw_enabled = false;

eidled = encx24j600_read_reg(priv, EIDLED);
if (((eidled & DEVID_MASK) >> DEVID_SHIFT) != ENCX24J600_DEV_ID) {
ret = -EINVAL;
goto err_out;
}

netif_info(priv, drv, dev, "Silicon rev ID: 0x%02x\n",
(eidled & REVID_MASK) >> REVID_SHIFT);

/* PHY Leds: link status,
* LEDA: Link State + collision events
* LEDB: Link State + transmit/receive events
Expand Down Expand Up @@ -655,7 +644,6 @@ static int encx24j600_hw_init(struct encx24j600_priv *priv)
if (netif_msg_hw(priv))
encx24j600_dump_config(priv, "Hw is initialized");

err_out:
return ret;
}

Expand Down Expand Up @@ -1004,6 +992,7 @@ static int encx24j600_spi_probe(struct spi_device *spi)

struct net_device *ndev;
struct encx24j600_priv *priv;
u16 eidled;

ndev = alloc_etherdev(sizeof(struct encx24j600_priv));

Expand Down Expand Up @@ -1072,10 +1061,21 @@ static int encx24j600_spi_probe(struct spi_device *spi)
goto out_free;
}

eidled = encx24j600_read_reg(priv, EIDLED);
if (((eidled & DEVID_MASK) >> DEVID_SHIFT) != ENCX24J600_DEV_ID) {
ret = -EINVAL;
goto out_unregister;
}

netif_info(priv, probe, ndev, "Silicon rev ID: 0x%02x\n",
(eidled & REVID_MASK) >> REVID_SHIFT);

netif_info(priv, drv, priv->ndev, "MAC address %pM\n", ndev->dev_addr);

return ret;

out_unregister:
unregister_netdev(priv->ndev);
out_free:
free_netdev(ndev);

Expand Down

0 comments on commit 7b5dc0d

Please sign in to comment.