hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

staging: most: usb: don't use expressions that might fail in a declaration 

This patch moves function calls that can fail out of the declararion block
of a function body. This is done to enhance readability.

Signed-off-by: Christian Gromm <christian.gromm@microchip.com>
Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Link: https://lore.kernel.org/r/1590570387-27069-3-git-send-email-christian.gromm@microchip.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Christian Gromm 2020-05-27 11:06:19 +02:00 committed by Greg Kroah-Hartman
parent 1c538a4179
commit a0dbe1b24c
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/staging/most/usb/usb.c
View File

@ -139,9 +139,10 @@ static void wq_netinfo(struct work_struct *wq_obj);
static inline int drci_rd_reg(struct usb_device *dev, u16 reg, u16 *buf) static inline int drci_rd_reg(struct usb_device *dev, u16 reg, u16 *buf)
{ {
int retval; int retval;
__le16 *dma_buf = kzalloc(sizeof(*dma_buf), GFP_KERNEL); __le16 *dma_buf;
u8 req_type = USB_DIR_IN | USB_TYPE_VENDOR | USB_RECIP_DEVICE; u8 req_type = USB_DIR_IN | USB_TYPE_VENDOR | USB_RECIP_DEVICE;
dma_buf = kzalloc(sizeof(*dma_buf), GFP_KERNEL);
if (!dma_buf) if (!dma_buf)
return -ENOMEM; return -ENOMEM;
@ -846,8 +847,9 @@ static ssize_t value_store(struct device *dev, struct device_attribute *attr,
const char *name = attr->attr.name; const char *name = attr->attr.name;
struct most_dci_obj *dci_obj = to_dci_obj(dev); struct most_dci_obj *dci_obj = to_dci_obj(dev);
struct usb_device *usb_dev = dci_obj->usb_device; struct usb_device *usb_dev = dci_obj->usb_device;
int err = kstrtou16(buf, 16, &val); int err;
err = kstrtou16(buf, 16, &val);
if (err) if (err)
return err; return err;
@ -939,13 +941,14 @@ hdm_probe(struct usb_interface *interface, const struct usb_device_id *id)
struct usb_host_interface *usb_iface_desc = interface->cur_altsetting; struct usb_host_interface *usb_iface_desc = interface->cur_altsetting;
struct usb_device *usb_dev = interface_to_usbdev(interface); struct usb_device *usb_dev = interface_to_usbdev(interface);
struct device *dev = &usb_dev->dev; struct device *dev = &usb_dev->dev;
struct most_dev *mdev = kzalloc(sizeof(*mdev), GFP_KERNEL); struct most_dev *mdev;
unsigned int i; unsigned int i;
unsigned int num_endpoints; unsigned int num_endpoints;
struct most_channel_capability *tmp_cap; struct most_channel_capability *tmp_cap;
struct usb_endpoint_descriptor *ep_desc; struct usb_endpoint_descriptor *ep_desc;
int ret = -ENOMEM; int ret = -ENOMEM;
mdev = kzalloc(sizeof(*mdev), GFP_KERNEL);
if (!mdev) if (!mdev)
return -ENOMEM; return -ENOMEM;