Commit 7f960633 authored by Jason Yan's avatar Jason Yan Committed by David S. Miller

net: encx24j600: make encx24j600_hw_init() return void

This function always return 0 now, we can make it return void to
simplify the code. This fixes the following coccicheck warning:

drivers/net/ethernet/microchip/encx24j600.c:609:5-8: Unneeded variable:
"ret". Return "0" on line 653
Signed-off-by: default avatarJason Yan <yanaijie@huawei.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 5a7c4509
...@@ -604,9 +604,8 @@ static void encx24j600_set_rxfilter_mode(struct encx24j600_priv *priv) ...@@ -604,9 +604,8 @@ static void encx24j600_set_rxfilter_mode(struct encx24j600_priv *priv)
} }
} }
static int encx24j600_hw_init(struct encx24j600_priv *priv) static void encx24j600_hw_init(struct encx24j600_priv *priv)
{ {
int ret = 0;
u16 macon2; u16 macon2;
priv->hw_enabled = false; priv->hw_enabled = false;
...@@ -649,8 +648,6 @@ static int encx24j600_hw_init(struct encx24j600_priv *priv) ...@@ -649,8 +648,6 @@ static int encx24j600_hw_init(struct encx24j600_priv *priv)
if (netif_msg_hw(priv)) if (netif_msg_hw(priv))
encx24j600_dump_config(priv, "Hw is initialized"); encx24j600_dump_config(priv, "Hw is initialized");
return ret;
} }
static void encx24j600_hw_enable(struct encx24j600_priv *priv) static void encx24j600_hw_enable(struct encx24j600_priv *priv)
...@@ -1042,12 +1039,7 @@ static int encx24j600_spi_probe(struct spi_device *spi) ...@@ -1042,12 +1039,7 @@ static int encx24j600_spi_probe(struct spi_device *spi)
} }
/* Initialize the device HW to the consistent state */ /* Initialize the device HW to the consistent state */
if (encx24j600_hw_init(priv)) { encx24j600_hw_init(priv);
netif_err(priv, probe, ndev,
DRV_NAME ": HW initialization error\n");
ret = -EIO;
goto out_free;
}
kthread_init_worker(&priv->kworker); kthread_init_worker(&priv->kworker);
kthread_init_work(&priv->tx_work, encx24j600_tx_proc); kthread_init_work(&priv->tx_work, encx24j600_tx_proc);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment