Commit cb3aadae authored by Kinka Huang's avatar Kinka Huang Committed by Greg Kroah-Hartman
Browse files

staging: comedi: removing not useful `else` after return 



Signed-off-by: default avatarKinka Huang <kinkabrain@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent f24937db

drivers/staging/comedi/comedi.h

+4 −4
Original line number Diff line number Diff line
@@ -555,7 +555,7 @@ static inline unsigned NI_USUAL_PFI_SELECT(unsigned pfi_channel) 
{

	if (pfi_channel < 10)

		return 0x1 + pfi_channel;

	else



	return 0xb + pfi_channel;

}
@@ -563,7 +563,7 @@ static inline unsigned NI_USUAL_RTSI_SELECT(unsigned rtsi_channel) 
{

	if (rtsi_channel < 7)

		return 0xb + rtsi_channel;

	else



	return 0x1b;

}

drivers/staging/comedi/comedi_fops.c

+4 −5
Original line number Diff line number Diff line
@@ -206,7 +206,7 @@ struct comedi_device *comedi_dev_get_from_minor(unsigned minor) 
{

	if (minor < COMEDI_NUM_BOARD_MINORS)

		return comedi_dev_get_from_board_minor(minor);

	else



	return comedi_dev_get_from_subdevice_minor(minor);

}

EXPORT_SYMBOL_GPL(comedi_dev_get_from_minor);
@@ -2625,11 +2625,10 @@ static int __init comedi_init(void) 
			unregister_chrdev_region(MKDEV(COMEDI_MAJOR, 0),

						 COMEDI_NUM_MINORS);

			return PTR_ERR(dev);

		} else {

		}

		/* comedi_alloc_board_minor() locked the mutex */

		mutex_unlock(&dev->mutex);

	}

	}



	return 0;

}

drivers/staging/comedi/comedidev.h

+2 −2
Original line number Diff line number Diff line
@@ -388,7 +388,7 @@ static inline unsigned int bytes_per_sample(const struct comedi_subdevice *subd) 
{

	if (subd->subdev_flags & SDF_LSAMPL)

		return sizeof(unsigned int);

	else



	return sizeof(short);

}