Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1399769
| Path | csiph.com!aioe.org!bofh.it!news.nic.it!robomod |
|---|---|
| From | Mathieu OTHACEHE <m.othacehe@gmail.com> |
| Newsgroups | linux.kernel |
| Subject | [PATCH 28/36] usb: serial: ti_usb_3410_5052: Use variables for vendor and product |
| Date | Thu, 12 May 2016 11:00:02 +0200 |
| Message-ID | <rxUDo-21y-1@gated-at.bofh.it> (permalink) |
| References | <rxUDo-21y-3@gated-at.bofh.it> |
| X-Original-To | johan@kernel.org |
| Dkim-Signature | v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=V+FWmOCXOUIRa2Gn6ZJvcPggQripHnjLPuN14HCcWV4=; b=RrEOUt2Ti8Mg4RBPx6lSmW1gcXjX3Nh+fsMuMfeku/Ig+GfnVq3v70mONmDOSUi8fB xghsN3dMHWHkRRkULe1kgigU+nm7n88WlwGAOqp1MY6OVUSg2akJ6Iji8sOiSAKJj5aZ 73jdOgzU3Qc+EQeGiJnssfWQGU2rLyIwv9WkombSoNOv5QMI5UTtpgvKm69aAyVL91e6 ZMuvrtv1EKeJ64uBHC2cCxVY1IFBr71rghkdONxjnYu7vKveDAEMfnvJcGk+f3kwlEV4 jbGqUFTtAZ3Pip2Wi5t8I5xXM3AUqEJ2obiTDx1Tn1/h1tqyRuD2UetUisKH8J9iLsTR wmkQ== |
| X-Google-Dkim-Signature | v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=V+FWmOCXOUIRa2Gn6ZJvcPggQripHnjLPuN14HCcWV4=; b=AsIadrf/eEpwfbevnkEOBDPt2/oied6EY+deo6bUVCV06xrAi20hhvGxMVC6O81u19 CsG6ebmMMU0nh0ieRRsrNxsuvUIXPYGFnSdstsVM9wzymWnU4imZXy0GAPxs4FTdtc7i cdAZAdHgr7fshNf9kx2rtsBudBJuPINKildpNF8enqnsYRiJU0qrMz32AoXJwaf8iDu2 7wbwYBDGsluZ0oi82+LJhqMJhpwSb/n0Hg/Q+sb/8EVaODnBEHVV4SLj6vNiQ0ZqI8rs n/x/LUNyD1M+PcLOWUceZskYlsDXD26Oxjhlox1C5WXjlqljHTcAseRPFvm6QFA136gc BeHQ== |
| X-Gm-Message-State | AOPr4FUDnXzL49hI3E1UdUw5MKC+QgX9w+MHdU2j6mN6qQ+22UCUlNrNwdBk3eD/aIPwFw== |
| X-Received | by 10.28.128.143 with SMTP id b137mr4631928wmd.57.1463043037796; Thu, 12 May 2016 01:50:37 -0700 (PDT) |
| X-Mailer | git-send-email 2.8.2 |
| Sender | robomod@news.nic.it |
| List-ID | <linux-kernel.vger.kernel.org> |
| X-Mailing-List | linux-kernel@vger.kernel.org |
| Approved | robomod@news.nic.it |
| Lines | 52 |
| Organization | linux.* mail to news gateway |
| X-Original-Cc | gregkh@linuxfoundation.org, linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org, Mathieu OTHACEHE <m.othacehe@gmail.com> |
| X-Original-Date | Thu, 12 May 2016 10:49:00 +0200 |
| X-Original-Message-ID | <1463042948-12205-29-git-send-email-m.othacehe@gmail.com> |
| X-Original-References | <1463042948-12205-1-git-send-email-m.othacehe@gmail.com> |
| X-Original-Sender | linux-kernel-owner@vger.kernel.org |
| Xref | csiph.com linux.kernel:1399769 |
Show key headers only | View raw
Use variables for vendor and product in download_firmware to improve
readability.
Signed-off-by: Mathieu OTHACEHE <m.othacehe@gmail.com>
---
drivers/usb/serial/ti_usb_3410_5052.c | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/drivers/usb/serial/ti_usb_3410_5052.c b/drivers/usb/serial/ti_usb_3410_5052.c
index 1b62ffb..72cb675 100644
--- a/drivers/usb/serial/ti_usb_3410_5052.c
+++ b/drivers/usb/serial/ti_usb_3410_5052.c
@@ -1316,7 +1316,10 @@ static int ti_download_firmware(struct usb_serial *serial)
struct ti_device *tdev = usb_get_serial_data(serial);
const struct firmware *fw_p;
char buf[32];
+ __le16 vendor, product;
+ vendor = le16_to_cpu(dev->descriptor.idVendor);
+ product = le16_to_cpu(dev->descriptor.idProduct);
if (le16_to_cpu(dev->descriptor.idVendor) == MXU1_VENDOR_ID) {
snprintf(buf,
@@ -1329,15 +1332,13 @@ static int ti_download_firmware(struct usb_serial *serial)
}
/* try ID specific firmware first, then try generic firmware */
- sprintf(buf, "ti_usb-v%04x-p%04x.fw",
- le16_to_cpu(dev->descriptor.idVendor),
- le16_to_cpu(dev->descriptor.idProduct));
+ sprintf(buf, "ti_usb-v%04x-p%04x.fw", vendor, product);
status = request_firmware(&fw_p, buf, &dev->dev);
if (status != 0) {
buf[0] = '\0';
- if (le16_to_cpu(dev->descriptor.idVendor) == MTS_VENDOR_ID) {
- switch (le16_to_cpu(dev->descriptor.idProduct)) {
+ if (vendor == MTS_VENDOR_ID) {
+ switch (product) {
case MTS_CDMA_PRODUCT_ID:
strcpy(buf, "mts_cdma.fw");
break;
@@ -1357,6 +1358,7 @@ static int ti_download_firmware(struct usb_serial *serial)
strcpy(buf, "mts_mt9234zba.fw");
break; }
}
+
if (buf[0] == '\0') {
if (tdev->td_is_3410)
strcpy(buf, "ti_3410.fw");
--
2.8.2
Back to linux.kernel | Previous | Next | Find similar | Unroll thread
[PATCH 28/36] usb: serial: ti_usb_3410_5052: Use variables for vendor and product Mathieu OTHACEHE <m.othacehe@gmail.com> - 2016-05-12 11:00 +0200
csiph-web