Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-26 04:42:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

staging: most: usb: replace code to calculate array index

Browse Source 
This patch removes the expression that makes use of a priori knowledge
about channel numbers to calculate an array index.
The expression 'peer = 1 - channel' utilizes the fact that an USB interface
that operates on the asynchronous data of the Network only has two
endpoints. Hence, channel being 0 or 1. The replacement is more simple and
less confusing when reading the code.

Signed-off-by: Christian Gromm <christian.gromm@microchip.com>
Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Link: https://lore.kernel.org/r/1590570387-27069-8-git-send-email-christian.gromm@microchip.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Christian Gromm 2020-05-27 11:06:24 +02:00 committed by Greg Kroah-Hartman
parent 6405fe2142
commit 1fd4fb8c62
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/staging/most/usb/usb.c
View File

@ -729,6 +729,8 @@ static void wq_clear_halt(struct work_struct *wq_obj)
struct most_dev *mdev = clear_work->mdev; struct most_dev *mdev = clear_work->mdev;
unsigned int channel = clear_work->channel; unsigned int channel = clear_work->channel;
int pipe = clear_work->pipe; int pipe = clear_work->pipe;
int snd_pipe;
int peer;
mutex_lock(&mdev->io_mutex); mutex_lock(&mdev->io_mutex);
most_stop_enqueue(&mdev->iface, channel); most_stop_enqueue(&mdev->iface, channel);
@ -746,9 +748,12 @@ static void wq_clear_halt(struct work_struct *wq_obj)
*/ */
if (mdev->conf[channel].data_type == MOST_CH_ASYNC && if (mdev->conf[channel].data_type == MOST_CH_ASYNC &&
mdev->conf[channel].direction == MOST_CH_RX) { mdev->conf[channel].direction == MOST_CH_RX) {
int peer = 1 - channel; if (channel == 0)
int snd_pipe = usb_sndbulkpipe(mdev->usb_device, peer = 1;
mdev->ep_address[peer]); else
peer = 0;
snd_pipe = usb_sndbulkpipe(mdev->usb_device,
mdev->ep_address[peer]);
usb_clear_halt(mdev->usb_device, snd_pipe); usb_clear_halt(mdev->usb_device, snd_pipe);
} }
mdev->is_channel_healthy[channel] = true; mdev->is_channel_healthy[channel] = true;