| Message ID | 20190705103732.30568-1-colin.king@canonical.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | c032461936de82a3f4108cacc7c3d1b204c42eef |
| Delegated to: | Kalle Valo |
| Headers | show |
| Series | wl3501_cs: remove redundant variable ret | expand |
Colin King <colin.king@canonical.com> writes: > From: Colin Ian King <colin.king@canonical.com> > > The variable ret is being initialized with a value that is never > read and it is being updated later with a new value that is returned. > The variable is redundant and can be replaced with a return 0 as > there are no other return points in this function. > > Addresses-Coverity: ("Unused value") > Signed-off-by: Colin Ian King <colin.king@canonical.com> > --- > drivers/net/wireless/wl3501_cs.c | 4 +--- > 1 file changed, 1 insertion(+), 3 deletions(-) > > diff --git a/drivers/net/wireless/wl3501_cs.c b/drivers/net/wireless/wl3501_cs.c > index a25b17932edb..007bf6803293 100644 > --- a/drivers/net/wireless/wl3501_cs.c > +++ b/drivers/net/wireless/wl3501_cs.c > @@ -1226,7 +1226,6 @@ static int wl3501_init_firmware(struct wl3501_card *this) > static int wl3501_close(struct net_device *dev) > { > struct wl3501_card *this = netdev_priv(dev); > - int rc = -ENODEV; I'll manually fix the commit log with: s/variable ret/variable rc/
Colin King <colin.king@canonical.com> wrote: > From: Colin Ian King <colin.king@canonical.com> > > The variable rc is being initialized with a value that is never > read and it is being updated later with a new value that is returned. > The variable is redundant and can be replaced with a return 0 as > there are no other return points in this function. > > Addresses-Coverity: ("Unused value") > Signed-off-by: Colin Ian King <colin.king@canonical.com> Patch applied to wireless-drivers-next.git, thanks. c032461936de wl3501_cs: remove redundant variable rc
diff --git a/drivers/net/wireless/wl3501_cs.c b/drivers/net/wireless/wl3501_cs.c index a25b17932edb..007bf6803293 100644 --- a/drivers/net/wireless/wl3501_cs.c +++ b/drivers/net/wireless/wl3501_cs.c @@ -1226,7 +1226,6 @@ static int wl3501_init_firmware(struct wl3501_card *this) static int wl3501_close(struct net_device *dev) { struct wl3501_card *this = netdev_priv(dev); - int rc = -ENODEV; unsigned long flags; struct pcmcia_device *link; link = this->p_dev; @@ -1241,10 +1240,9 @@ static int wl3501_close(struct net_device *dev) /* Mask interrupts from the SUTRO */ wl3501_block_interrupt(this); - rc = 0; printk(KERN_INFO "%s: WL3501 closed\n", dev->name); spin_unlock_irqrestore(&this->lock, flags); - return rc; + return 0; } /**