From: "Mychaela N. Falconia" <falcon@freecalypso.org>
To: Johan Hovold <johan@kernel.org>
Cc: linux-usb@vger.kernel.org, mychaela.falconia@gmail.com
Subject: [PATCH v3 1/3] USB: serial: ftdi_sio: use cur_altsetting for consistency
Date: Fri, 2 Oct 2020 18:49:37 +0000 (UTC) [thread overview]
Message-ID: <20201002184937.65BAB3740218@freecalypso.org> (raw)
ftdi_determine_type() function had this construct in it to get the
number of the interface it is operating on:
inter = serial->interface->altsetting->desc.bInterfaceNumber;
Elsewhere in this driver cur_altsetting is used instead for this
purpose. Change ftdi_determine_type() to use cur_altsetting
for consistency.
Signed-off-by: Mychaela N. Falconia <falcon@freecalypso.org>
---
Simply changing altsetting to cur_altsetting would have caused the
offending line to exceed the 80 character limit. Instead I changed
the code structure to be the same as in Johan's recent JTAG quirk
cleanup patch.
---
drivers/usb/serial/ftdi_sio.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c
index 12a4b74ca1f4..a34c0d8b0cd3 100644
--- a/drivers/usb/serial/ftdi_sio.c
+++ b/drivers/usb/serial/ftdi_sio.c
@@ -1571,7 +1571,8 @@ static void ftdi_determine_type(struct usb_serial_port *port)
dev_dbg(&port->dev, "%s: bcdDevice = 0x%x, bNumInterfaces = %u\n", __func__,
version, interfaces);
if (interfaces > 1) {
- int inter;
+ struct usb_interface *intf = serial->interface;
+ int ifnum = intf->cur_altsetting->desc.bInterfaceNumber;
/* Multiple interfaces.*/
if (version == 0x0800) {
@@ -1586,14 +1587,13 @@ static void ftdi_determine_type(struct usb_serial_port *port)
priv->chip_type = FT2232C;
/* Determine interface code. */
- inter = serial->interface->altsetting->desc.bInterfaceNumber;
- if (inter == 0) {
+ if (ifnum == 0) {
priv->interface = INTERFACE_A;
- } else if (inter == 1) {
+ } else if (ifnum == 1) {
priv->interface = INTERFACE_B;
- } else if (inter == 2) {
+ } else if (ifnum == 2) {
priv->interface = INTERFACE_C;
- } else if (inter == 3) {
+ } else if (ifnum == 3) {
priv->interface = INTERFACE_D;
}
/* BM-type devices have a bug where bcdDevice gets set
--
2.9.0
next reply other threads:[~2020-10-02 18:50 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-02 18:49 Mychaela N. Falconia [this message]
2020-10-05 11:00 ` [PATCH v3 1/3] USB: serial: ftdi_sio: use cur_altsetting for consistency Johan Hovold
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201002184937.65BAB3740218@freecalypso.org \
--to=falcon@freecalypso.org \
--cc=johan@kernel.org \
--cc=linux-usb@vger.kernel.org \
--cc=mychaela.falconia@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).