evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

USB: qcserial: consolidate usb_set_interface calls

Browse source 
No need to replicate the same code all over the place.

Signed-off-by: Bjørn Mork <bjorn@mork.no>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Bjørn Mork 2012-07-15 16:47:36 +02:00 • committed by Greg Kroah-Hartman
parent 2c026e2b36
commit 2cf69930f0
1 changed files with 16 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

49
drivers/usb/serial/qcserial.c
View file

@ -127,6 +127,7 @@ static int qcprobe(struct usb_serial *serial, const struct usb_device_id *id)
__u8 nintf; __u8 nintf;
__u8 ifnum; __u8 ifnum;
bool is_gobi1k = id->driver_info ? true : false; bool is_gobi1k = id->driver_info ? true : false;
int altsetting = -1;
dev_dbg(dev, "Is Gobi 1000 = %d\n", is_gobi1k); dev_dbg(dev, "Is Gobi 1000 = %d\n", is_gobi1k);
@ -160,15 +161,7 @@ static int qcprobe(struct usb_serial *serial, const struct usb_device_id *id)
retval = 0; /* Success */ retval = 0; /* Success */
break; break;
} }
altsetting = 1;
retval = usb_set_interface(serial->dev, ifnum, 1);
if (retval < 0) {
dev_err(dev,
"Could not set interface, error %d\n",
retval);
retval = -ENODEV;
kfree(data);
}
} }
break; break;
@ -193,24 +186,10 @@ static int qcprobe(struct usb_serial *serial, const struct usb_device_id *id)
if (ifnum == 1 && !is_gobi1k) { if (ifnum == 1 && !is_gobi1k) {
dev_dbg(dev, "Gobi 2K+ DM/DIAG interface found\n"); dev_dbg(dev, "Gobi 2K+ DM/DIAG interface found\n");
retval = usb_set_interface(serial->dev, ifnum, 0); altsetting = 0;
if (retval < 0) {
dev_err(dev,
"Could not set interface, error %d\n",
retval);
retval = -ENODEV;
kfree(data);
}
} else if (ifnum == 2) { } else if (ifnum == 2) {
dev_dbg(dev, "Modem port found\n"); dev_dbg(dev, "Modem port found\n");
retval = usb_set_interface(serial->dev, ifnum, 0); altsetting = 0;
if (retval < 0) {
dev_err(dev,
"Could not set interface, error %d\n",
retval);
retval = -ENODEV;
kfree(data);
}
} else if (ifnum==3 && !is_gobi1k) { } else if (ifnum==3 && !is_gobi1k) {
/* /*
* NMEA (serial line 9600 8N1) * NMEA (serial line 9600 8N1)
@ -218,14 +197,7 @@ static int qcprobe(struct usb_serial *serial, const struct usb_device_id *id)
* # echo "\$GPS_STOP" > /dev/ttyUSBx * # echo "\$GPS_STOP" > /dev/ttyUSBx
*/ */
dev_dbg(dev, "Gobi 2K+ NMEA GPS interface found\n"); dev_dbg(dev, "Gobi 2K+ NMEA GPS interface found\n");
retval = usb_set_interface(serial->dev, ifnum, 0); altsetting = 0;
if (retval < 0) {
dev_err(dev,
"Could not set interface, error %d\n",
retval);
retval = -ENODEV;
kfree(data);
}
} }
break; break;
@ -235,6 +207,17 @@ static int qcprobe(struct usb_serial *serial, const struct usb_device_id *id)
retval = -ENODEV; retval = -ENODEV;
} }
if (altsetting >= 0) {
retval = usb_set_interface(serial->dev, ifnum, altsetting);
if (retval < 0) {
dev_err(dev,
"Could not set interface, error %d\n",
retval);
retval = -ENODEV;
kfree(data);
}
}
/* Set serial->private if not returning -ENODEV */ /* Set serial->private if not returning -ENODEV */
if (retval != -ENODEV) if (retval != -ENODEV)
usb_set_serial_data(serial, data); usb_set_serial_data(serial, data);