diff options
| author |   Misha Gusarov <dottedmag@dottedmag.net> | 2020-10-24 22:22:21 +0200 |
|---|---|---|
| committer |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-10-26 06:53:10 +0100 |
| commit | 01a050e8e468cce2e2e8659c0cedabc264c5c872 (patch) | |
| tree | cfd1e5c2cae566810016f78e1fd7ed80ce180228 /drivers/staging/gdm724x | |
| parent | staging: kpc2000: Use BIT macro instead of bit masking (diff) | |
| download | linux-dev-01a050e8e468cce2e2e8659c0cedabc264c5c872.tar.xz linux-dev-01a050e8e468cce2e2e8659c0cedabc264c5c872.zip | |
staging: gdm724x: Clarify naming of packet_type<->tty index symbols
This driver was using "packet_type" for packet types and for
the mapping of TTY indices to packet types.
Fix the confusion by renaming the symbols.
Fixes sparse warning:
drivers/staging/gdm724x/gdm_mux.c:146:24: warning: symbol 'packet_type' shadows an earlier one
Signed-off-by: Misha Gusarov <dottedmag@dottedmag.net>
Link: https://lore.kernel.org/r/20201024202221.60726-1-dottedmag@dottedmag.net
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/gdm724x')
| -rw-r--r-- | drivers/staging/gdm724x/gdm_mux.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/staging/gdm724x/gdm_mux.c b/drivers/staging/gdm724x/gdm_mux.c index 0678f344fafb..9b12619671a1 100644 --- a/drivers/staging/gdm724x/gdm_mux.c +++ b/drivers/staging/gdm724x/gdm_mux.c @@ -16,7 +16,7 @@ #include "gdm_mux.h" -static u16 packet_type[TTY_MAX_COUNT] = {0xF011, 0xF010}; +static u16 packet_type_for_tty_index[TTY_MAX_COUNT] = {0xF011, 0xF010}; #define USB_DEVICE_CDC_DATA(vid, pid) \ .match_flags = \ @@ -38,12 +38,12 @@ static const struct usb_device_id id_table[] = { MODULE_DEVICE_TABLE(usb, id_table); -static int packet_type_to_index(u16 packetType) +static int packet_type_to_tty_index(u16 packet_type) { int i; for (i = 0; i < TTY_MAX_COUNT; i++) { - if (packet_type[i] == packetType) + if (packet_type_for_tty_index[i] == packet_type) return i; } @@ -170,7 +170,7 @@ static int up_to_host(struct mux_rx *r) break; } - index = packet_type_to_index(packet_type); + index = packet_type_to_tty_index(packet_type); if (index < 0) { pr_err("invalid index %d\n", index); break; @@ -372,7 +372,7 @@ static int gdm_mux_send(void *priv_dev, void *data, int len, int tty_index, mux_header->start_flag = __cpu_to_le32(START_FLAG); mux_header->seq_num = __cpu_to_le32(seq_num++); mux_header->payload_size = __cpu_to_le32((u32)len); - mux_header->packet_type = __cpu_to_le16(packet_type[tty_index]); + mux_header->packet_type = __cpu_to_le16(packet_type_for_tty_index[tty_index]); memcpy(t->buf + MUX_HEADER_SIZE, data, len); memset(t->buf + MUX_HEADER_SIZE + len, 0, |