Commit c5274ab0 authored by Greg Dietsche's avatar Greg Dietsche Committed by Greg Kroah-Hartman
Browse files

staging: remove unnecessary code 



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

Signed-off-by: default avatarGreg Dietsche <Gregory.Dietsche@cuw.edu>
Acked-by: default avatarFranky Lin <frankyl@broadcom.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 9996059d

drivers/staging/bcm/Misc.c

+2 −8
Original line number Diff line number Diff line
@@ -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;

drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c

+1 −7
Original line number Diff line number Diff line
@@ -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)

drivers/staging/comedi/comedi_fops.c

+1 −1
Original line number Diff line number Diff line
@@ -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

drivers/staging/comedi/drivers/usbdux.c

+1 −4
Original line number Diff line number Diff line
@@ -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)

drivers/staging/tm6000/tm6000-cards.c

+1 −5
Original line number Diff line number Diff line
@@ -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);

}