| Message ID | 20200414120251.35869-1-yanaijie@huawei.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 5a652b49b41b1cbffe2beedbaf253f60f768fd92 |
| Delegated to: | Kalle Valo |
| Headers | show |
| Series | ipw2x00: make ipw_setup_deferred_work() void | expand |
Jason Yan <yanaijie@huawei.com> wrote: > This function actually needs no return value. So remove the unneeded > variable 'ret' and make it void. > > This also fixes the following coccicheck warning: > > drivers/net/wireless/intel/ipw2x00/ipw2200.c:10648:5-8: Unneeded > variable: "ret". Return "0" on line 10684 > > Signed-off-by: Jason Yan <yanaijie@huawei.com> Patch applied to wireless-drivers-next.git, thanks. 5a652b49b41b ipw2x00: make ipw_setup_deferred_work() void
diff --git a/drivers/net/wireless/intel/ipw2x00/ipw2200.c b/drivers/net/wireless/intel/ipw2x00/ipw2200.c index 201a1eb0e2f6..923be3781c92 100644 --- a/drivers/net/wireless/intel/ipw2x00/ipw2200.c +++ b/drivers/net/wireless/intel/ipw2x00/ipw2200.c @@ -10640,10 +10640,8 @@ static void ipw_bg_link_down(struct work_struct *work) mutex_unlock(&priv->mutex); } -static int ipw_setup_deferred_work(struct ipw_priv *priv) +static void ipw_setup_deferred_work(struct ipw_priv *priv) { - int ret = 0; - init_waitqueue_head(&priv->wait_command_queue); init_waitqueue_head(&priv->wait_state); @@ -10677,8 +10675,6 @@ static int ipw_setup_deferred_work(struct ipw_priv *priv) tasklet_init(&priv->irq_tasklet, ipw_irq_tasklet, (unsigned long)priv); - - return ret; } static void shim__set_security(struct net_device *dev, @@ -11659,11 +11655,7 @@ static int ipw_pci_probe(struct pci_dev *pdev, IPW_DEBUG_INFO("pci_resource_len = 0x%08x\n", length); IPW_DEBUG_INFO("pci_resource_base = %p\n", base); - err = ipw_setup_deferred_work(priv); - if (err) { - IPW_ERROR("Unable to setup deferred work\n"); - goto out_iounmap; - } + ipw_setup_deferred_work(priv); ipw_sw_reset(priv, 1);
This function actually needs no return value. So remove the unneeded variable 'ret' and make it void. This also fixes the following coccicheck warning: drivers/net/wireless/intel/ipw2x00/ipw2200.c:10648:5-8: Unneeded variable: "ret". Return "0" on line 10684 Signed-off-by: Jason Yan <yanaijie@huawei.com> --- drivers/net/wireless/intel/ipw2x00/ipw2200.c | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-)