lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

usbnet: sierra_net: apply introduced usb command APIs

Browse Source 
Acked-by: Oliver Neukum <oneukum@suse.de>
Signed-off-by: Ming Lei <ming.lei@canonical.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Ming Lei
2012-10-24 19:47:02 +00:00
committed by David S. Miller
parent 7cdd248799
commit f7385ec918
1 changed files with 15 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
drivers/net/usb/sierra_net.c
View File

@@ -311,10 +311,9 @@ static int sierra_net_send_cmd(struct usbnet *dev,
struct sierra_net_data *priv = sierra_net_get_private(dev); struct sierra_net_data *priv = sierra_net_get_private(dev);
int status; int status;
status = usb_control_msg(dev->udev, usb_sndctrlpipe(dev->udev, 0), status = usbnet_write_cmd(dev, USB_CDC_SEND_ENCAPSULATED_COMMAND,
USB_CDC_SEND_ENCAPSULATED_COMMAND, USB_DIR_OUT|USB_TYPE_CLASS|USB_RECIP_INTERFACE,
USB_DIR_OUT|USB_TYPE_CLASS|USB_RECIP_INTERFACE, 0, 0, priv->ifnum, cmd, cmdlen);
priv->ifnum, cmd, cmdlen, USB_CTRL_SET_TIMEOUT);
if (status != cmdlen && status != -ENODEV) if (status != cmdlen && status != -ENODEV)
netdev_err(dev->net, "Submit %s failed %d\n", cmd_name, status); netdev_err(dev->net, "Submit %s failed %d\n", cmd_name, status);
@@ -632,32 +631,22 @@ static int sierra_net_change_mtu(struct net_device *net, int new_mtu)
static int sierra_net_get_fw_attr(struct usbnet *dev, u16 *datap) static int sierra_net_get_fw_attr(struct usbnet *dev, u16 *datap)
{ {
int result = 0; int result = 0;
u16 *attrdata; u16 attrdata;
attrdata = kmalloc(sizeof(*attrdata), GFP_KERNEL); result = usbnet_read_cmd(dev,
if (!attrdata) /* _u8 vendor specific request */
return -ENOMEM; SWI_USB_REQUEST_GET_FW_ATTR,
USB_DIR_IN | USB_TYPE_VENDOR, /* __u8 request type */
0x0000, /* __u16 value not used */
0x0000, /* __u16 index not used */
&attrdata, /* char *data */
sizeof(attrdata) /* __u16 size */
);
result = usb_control_msg( if (result < 0)
dev->udev,
usb_rcvctrlpipe(dev->udev, 0),
/* _u8 vendor specific request */
SWI_USB_REQUEST_GET_FW_ATTR,
USB_DIR_IN | USB_TYPE_VENDOR, /* __u8 request type */
0x0000, /* __u16 value not used */
0x0000, /* __u16 index not used */
attrdata, /* char *data */
sizeof(*attrdata), /* __u16 size */
USB_CTRL_SET_TIMEOUT); /* int timeout */
if (result < 0) {
kfree(attrdata);
return -EIO; return -EIO;
}
*datap = le16_to_cpu(*attrdata); *datap = le16_to_cpu(attrdata);
kfree(attrdata);
return result; return result;
} }