From 8319aeb1dad46c4b6d35ea16a5697ff8160dd4d1 Mon Sep 17 00:00:00 2001 From: Masahiro Yamada Date: Tue, 6 Sep 2016 22:17:35 +0900 Subject: [PATCH] usb: squash lines for immediate return This makes functions much simpler. Signed-off-by: Masahiro Yamada --- common/usb.c | 20 +++++++------------- common/usb_kbd.c | 5 +---- common/usb_storage.c | 9 +++------ drivers/usb/host/xhci-fsl.c | 7 +------ 4 files changed, 12 insertions(+), 29 deletions(-) diff --git a/common/usb.c b/common/usb.c index b3ba487890..15e1e4c64e 100644 --- a/common/usb.c +++ b/common/usb.c @@ -557,12 +557,10 @@ int usb_clear_halt(struct usb_device *dev, int pipe) static int usb_get_descriptor(struct usb_device *dev, unsigned char type, unsigned char index, void *buf, int size) { - int res; - res = usb_control_msg(dev, usb_rcvctrlpipe(dev, 0), - USB_REQ_GET_DESCRIPTOR, USB_DIR_IN, - (type << 8) + index, 0, - buf, size, USB_CNTL_TIMEOUT); - return res; + return usb_control_msg(dev, usb_rcvctrlpipe(dev, 0), + USB_REQ_GET_DESCRIPTOR, USB_DIR_IN, + (type << 8) + index, 0, buf, size, + USB_CNTL_TIMEOUT); } /********************************************************************** @@ -612,14 +610,10 @@ int usb_get_configuration_no(struct usb_device *dev, int cfgno, */ static int usb_set_address(struct usb_device *dev) { - int res; - debug("set address %d\n", dev->devnum); - res = usb_control_msg(dev, usb_snddefctrl(dev), - USB_REQ_SET_ADDRESS, 0, - (dev->devnum), 0, - NULL, 0, USB_CNTL_TIMEOUT); - return res; + + return usb_control_msg(dev, usb_snddefctrl(dev), USB_REQ_SET_ADDRESS, + 0, (dev->devnum), 0, NULL, 0, USB_CNTL_TIMEOUT); } /******************************************************************** diff --git a/common/usb_kbd.c b/common/usb_kbd.c index 97f79f8eb8..a9872a6b5a 100644 --- a/common/usb_kbd.c +++ b/common/usb_kbd.c @@ -605,11 +605,8 @@ int usb_kbd_deregister(int force) static int usb_kbd_probe(struct udevice *dev) { struct usb_device *udev = dev_get_parent_priv(dev); - int ret; - - ret = probe_usb_keyboard(udev); - return ret; + return probe_usb_keyboard(udev); } static int usb_kbd_remove(struct udevice *dev) diff --git a/common/usb_storage.c b/common/usb_storage.c index 7e6e52d2ec..0345aa22ef 100644 --- a/common/usb_storage.c +++ b/common/usb_storage.c @@ -708,13 +708,10 @@ static int usb_stor_CBI_get_status(ccb *srb, struct us_data *us) /* clear a stall on an endpoint - special for BBB devices */ static int usb_stor_BBB_clear_endpt_stall(struct us_data *us, __u8 endpt) { - int result; - /* ENDPOINT_HALT = 0, so set value to 0 */ - result = usb_control_msg(us->pusb_dev, usb_sndctrlpipe(us->pusb_dev, 0), - USB_REQ_CLEAR_FEATURE, USB_RECIP_ENDPOINT, - 0, endpt, NULL, 0, USB_CNTL_TIMEOUT * 5); - return result; + return usb_control_msg(us->pusb_dev, usb_sndctrlpipe(us->pusb_dev, 0), + USB_REQ_CLEAR_FEATURE, USB_RECIP_ENDPOINT, 0, + endpt, NULL, 0, USB_CNTL_TIMEOUT * 5); } static int usb_stor_BBB_transport(ccb *srb, struct us_data *us) diff --git a/drivers/usb/host/xhci-fsl.c b/drivers/usb/host/xhci-fsl.c index bdcd4f1c99..6ff450cc75 100644 --- a/drivers/usb/host/xhci-fsl.c +++ b/drivers/usb/host/xhci-fsl.c @@ -129,15 +129,10 @@ static int xhci_fsl_probe(struct udevice *dev) static int xhci_fsl_remove(struct udevice *dev) { struct xhci_fsl_priv *priv = dev_get_priv(dev); - int ret; fsl_xhci_core_exit(&priv->ctx); - ret = xhci_deregister(dev); - if (ret) - return ret; - - return 0; + return xhci_deregister(dev); } static const struct udevice_id xhci_usb_ids[] = { -- 2.34.1