kpriv/linux-hardened
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

cdc-acm: beautify probe()

Browse source 
This removes some overly long lines by renaming variables and giving
them local scope.

Signed-off-by: Oliver Neukum <oneukum@suse.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Oliver Neukum 2016-07-14 15:41:34 +02:00 committed by Greg Kroah-Hartman
parent 7fae7bfb9a
commit cb42b63d89
1 changed files with 24 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
drivers/usb/class/cdc-acm.c
View file

@ -1146,8 +1146,7 @@ static int acm_probe(struct usb_interface *intf,
const struct usb_device_id *id) const struct usb_device_id *id)
{ {
struct usb_cdc_union_desc *union_header = NULL; struct usb_cdc_union_desc *union_header = NULL;
struct usb_cdc_country_functional_desc *cfd = NULL; struct usb_cdc_call_mgmt_descriptor *cmgmd = NULL;
struct usb_cdc_call_mgmt_descriptor *cmd = NULL;
unsigned char *buffer = intf->altsetting->extra; unsigned char *buffer = intf->altsetting->extra;
int buflen = intf->altsetting->extralen; int buflen = intf->altsetting->extralen;
struct usb_interface *control_interface; struct usb_interface *control_interface;
@ -1156,13 +1155,13 @@ static int acm_probe(struct usb_interface *intf,
struct usb_endpoint_descriptor *epread = NULL; struct usb_endpoint_descriptor *epread = NULL;
struct usb_endpoint_descriptor *epwrite = NULL; struct usb_endpoint_descriptor *epwrite = NULL;
struct usb_device *usb_dev = interface_to_usbdev(intf); struct usb_device *usb_dev = interface_to_usbdev(intf);
struct usb_cdc_parsed_header hdr; struct usb_cdc_parsed_header h;
struct acm *acm; struct acm *acm;
int minor; int minor;
int ctrlsize, readsize; int ctrlsize, readsize;
u8 *buf; u8 *buf;
int call_interface_num = -1; int call_intf_num = -1;
int data_interface_num = -1; int data_intf_num = -1;
unsigned long quirks; unsigned long quirks;
int num_rx_buf; int num_rx_buf;
int i; int i;
@ -1209,20 +1208,22 @@ static int acm_probe(struct usb_interface *intf,
} }
} }
cdc_parse_cdc_header(&hdr, intf, buffer, buflen); cdc_parse_cdc_header(&h, intf, buffer, buflen);
union_header = hdr.usb_cdc_union_desc; union_header = h.usb_cdc_union_desc;
cmd = hdr.usb_cdc_call_mgmt_descriptor; cmgmd = h.usb_cdc_call_mgmt_descriptor;
if (cmd) if (cmgmd)
call_interface_num = cmd->bDataInterface; call_intf_num = cmgmd->bDataInterface;
if (!union_header) { if (!union_header) {
if (call_interface_num > 0) { if (call_intf_num > 0) {
dev_dbg(&intf->dev, "No union descriptor, using call management descriptor\n"); dev_dbg(&intf->dev, "No union descriptor, using call management descriptor\n");
/* quirks for Droids MuIn LCD */ /* quirks for Droids MuIn LCD */
if (quirks & NO_DATA_INTERFACE) if (quirks & NO_DATA_INTERFACE) {
data_interface = usb_ifnum_to_if(usb_dev, 0); data_interface = usb_ifnum_to_if(usb_dev, 0);
else } else {
data_interface = usb_ifnum_to_if(usb_dev, (data_interface_num = call_interface_num)); data_intf_num = call_intf_num;
data_interface = usb_ifnum_to_if(usb_dev, data_intf_num);
}
control_interface = intf; control_interface = intf;
} else { } else {
if (intf->cur_altsetting->desc.bNumEndpoints != 3) { if (intf->cur_altsetting->desc.bNumEndpoints != 3) {
@ -1236,8 +1237,9 @@ static int acm_probe(struct usb_interface *intf,
} }
} }
} else { } else {
data_intf_num = union_header->bSlaveInterface0;
control_interface = usb_ifnum_to_if(usb_dev, union_header->bMasterInterface0); control_interface = usb_ifnum_to_if(usb_dev, union_header->bMasterInterface0);
data_interface = usb_ifnum_to_if(usb_dev, (data_interface_num = union_header->bSlaveInterface0)); data_interface = usb_ifnum_to_if(usb_dev, data_intf_num);
} }
if (!control_interface || !data_interface) { if (!control_interface || !data_interface) {
@ -1245,7 +1247,7 @@ static int acm_probe(struct usb_interface *intf,
return -ENODEV; return -ENODEV;
} }
if (data_interface_num != call_interface_num) if (data_intf_num != call_intf_num)
dev_dbg(&intf->dev, "Separate call control interface. That is not fully supported.\n"); dev_dbg(&intf->dev, "Separate call control interface. That is not fully supported.\n");
if (control_interface == data_interface) { if (control_interface == data_interface) {
@ -1340,8 +1342,8 @@ made_compressed_probe:
acm->data = data_interface; acm->data = data_interface;
acm->minor = minor; acm->minor = minor;
acm->dev = usb_dev; acm->dev = usb_dev;
if (hdr.usb_cdc_acm_descriptor) if (h.usb_cdc_acm_descriptor)
acm->ctrl_caps = hdr.usb_cdc_acm_descriptor->bmCapabilities; acm->ctrl_caps = h.usb_cdc_acm_descriptor->bmCapabilities;
if (quirks & NO_CAP_LINE) if (quirks & NO_CAP_LINE)
acm->ctrl_caps &= ~USB_CDC_CAP_LINE; acm->ctrl_caps &= ~USB_CDC_CAP_LINE;
acm->ctrlsize = ctrlsize; acm->ctrlsize = ctrlsize;
@ -1435,8 +1437,10 @@ made_compressed_probe:
if (i < 0) if (i < 0)
goto alloc_fail7; goto alloc_fail7;
cfd = hdr.usb_cdc_country_functional_desc; if (h.usb_cdc_country_functional_desc) { /* export the country data */
if (cfd) { /* export the country data */ struct usb_cdc_country_functional_desc * cfd =
h.usb_cdc_country_functional_desc;
acm->country_codes = kmalloc(cfd->bLength - 4, GFP_KERNEL); acm->country_codes = kmalloc(cfd->bLength - 4, GFP_KERNEL);
if (!acm->country_codes) if (!acm->country_codes)
goto skip_countries; goto skip_countries;