Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-02 10:11:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

staging: remove unnecessary code

Browse Source 
Compile tested.
remove unnecessary code that matches this coccinelle pattern
	if (...)
		return ret;
	return ret;

Signed-off-by: Greg Dietsche <Gregory.Dietsche@cuw.edu>
Acked-by: Franky Lin <frankyl@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Greg Dietsche 2011-06-13 13:11:47 -05:00 committed by Greg Kroah-Hartman
parent 9996059d8b
commit c5274ab097
5 changed files with 6 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/staging/bcm/Misc.c
View File

@ -1447,16 +1447,10 @@ static void convertEndian(B_UINT8 rwFlag, PUINT puiBuffer, UINT uiByteCount)
int rdm(PMINI_ADAPTER Adapter, UINT uiAddress, PCHAR pucBuff, size_t sSize)
{
INT uiRetVal =0;
uiRetVal = Adapter->interface_rdm(Adapter->pvInterfaceAdapter,
return Adapter->interface_rdm(Adapter->pvInterfaceAdapter,
uiAddress, pucBuff, sSize);
if(uiRetVal < 0)
return uiRetVal;
return uiRetVal;
}
int wrm(PMINI_ADAPTER Adapter, UINT uiAddress, PCHAR pucBuff, size_t sSize)
{
int iRetVal;

8
drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c
View File

@ -4164,13 +4164,7 @@ s32 wl_cfg80211_down(void)
static s32 wl_dongle_probecap(struct wl_priv *wl)
{
s32 err = 0;
err = wl_update_wiphybands(wl);
if (unlikely(err))
return err;
return err;
return wl_update_wiphybands(wl);
}
static void *wl_read_prof(struct wl_priv *wl, s32 item)

2
drivers/staging/comedi/comedi_fops.c
View File

@ -1291,10 +1291,10 @@ static int do_lock_ioctl(struct comedi_device *dev, unsigned int arg,
s->lock = file;
spin_unlock_irqrestore(&s->spin_lock, flags);
#if 0
if (ret < 0)
return ret;
#if 0
if (s->lock_f)
ret = s->lock_f(dev, s);
#endif

5
drivers/staging/comedi/drivers/usbdux.c
View File

@ -1935,11 +1935,8 @@ static int usbdux_pwm_cancel(struct comedi_device *dev,
dev_dbg(&this_usbduxsub->interface->dev,
"comedi %d: sending pwm off command to the usb device.\n",
dev->minor);
res = send_dux_commands(this_usbduxsub, SENDPWMOFF);
if (res < 0)
return res;
return res;
return send_dux_commands(this_usbduxsub, SENDPWMOFF);
}
static void usbduxsub_pwm_irq(struct urb *urb)

6
drivers/staging/tm6000/tm6000-cards.c
View File

@ -994,11 +994,7 @@ static int fill_board_specific_data(struct tm6000_core *dev)
if (rc < 0)
return rc;
rc = v4l2_device_register(&dev->udev->dev, &dev->v4l2_dev);
if (rc < 0)
return rc;
return rc;
return v4l2_device_register(&dev->udev->dev, &dev->v4l2_dev);
}