public-mirrors/linux
1
0
Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-05-24 10:39:52 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

staging: most: hdm-usb: remove redundant parenthesis

Browse source 
This patch removes unnecessary parenthesis in boolean expressions.

Signed-off-by: Andrey Shvetsov <andrey.shvetsov@k2l.de>
Signed-off-by: Christian Gromm <christian.gromm@microchip.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Christian Gromm 2016-08-19 11:12:58 +02:00 • committed by Greg Kroah-Hartman
parent 4b1a7cf1cc
commit dd53ecbace
1 changed files with 25 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
drivers/staging/most/hdm-usb/hdm_usb.c
View file

@ -217,7 +217,7 @@ static void free_anchored_buffers(struct most_dev *mdev, unsigned int channel,
if (likely(urb)) { if (likely(urb)) {
mbo = urb->context; mbo = urb->context;
usb_kill_urb(urb); usb_kill_urb(urb);
if ((mbo) && (mbo->complete)) { if (mbo && mbo->complete) {
mbo->status = status; mbo->status = status;
mbo->processed_length = 0; mbo->processed_length = 0;
mbo->complete(mbo); mbo->complete(mbo);
@ -287,7 +287,7 @@ static int hdm_poison_channel(struct most_interface *iface, int channel)
dev_warn(&mdev->usb_device->dev, "Poison: Bad interface.\n"); dev_warn(&mdev->usb_device->dev, "Poison: Bad interface.\n");
return -EIO; return -EIO;
} }
if (unlikely((channel < 0) || (channel >= iface->num_channels))) { if (unlikely(channel < 0 || channel >= iface->num_channels)) {
dev_warn(&mdev->usb_device->dev, "Channel ID out of range.\n"); dev_warn(&mdev->usb_device->dev, "Channel ID out of range.\n");
return -ECHRNG; return -ECHRNG;
} }
@ -407,8 +407,8 @@ static void hdm_write_completion(struct urb *urb)
lock = mdev->anchor_list_lock + channel; lock = mdev->anchor_list_lock + channel;
spin_lock_irqsave(lock, flags); spin_lock_irqsave(lock, flags);
if ((urb->status == -ENOENT) || (urb->status == -ECONNRESET) || if (urb->status == -ENOENT || urb->status == -ECONNRESET ||
(!mdev->is_channel_healthy[channel])) { !mdev->is_channel_healthy[channel]) {
spin_unlock_irqrestore(lock, flags); spin_unlock_irqrestore(lock, flags);
return; return;
} }
@ -572,8 +572,8 @@ static void hdm_read_completion(struct urb *urb)
lock = mdev->anchor_list_lock + channel; lock = mdev->anchor_list_lock + channel;
spin_lock_irqsave(lock, flags); spin_lock_irqsave(lock, flags);
if ((urb->status == -ENOENT) || (urb->status == -ECONNRESET) || if (urb->status == -ENOENT || urb->status == -ECONNRESET ||
(!mdev->is_channel_healthy[channel])) { !mdev->is_channel_healthy[channel]) {
spin_unlock_irqrestore(lock, flags); spin_unlock_irqrestore(lock, flags);
return; return;
} }
@ -649,7 +649,7 @@ static int hdm_enqueue(struct most_interface *iface, int channel,
if (unlikely(!iface || !mbo)) if (unlikely(!iface || !mbo))
return -EIO; return -EIO;
if (unlikely(iface->num_channels <= channel) || (channel < 0)) if (unlikely(iface->num_channels <= channel || channel < 0))
return -ECHRNG; return -ECHRNG;
mdev = to_mdev(iface); mdev = to_mdev(iface);
@ -672,9 +672,8 @@ static int hdm_enqueue(struct most_interface *iface, int channel,
anchor->urb = urb; anchor->urb = urb;
mbo->priv = anchor; mbo->priv = anchor;
if ((mdev->padding_active[channel]) && if ((conf->direction & MOST_CH_TX) && mdev->padding_active[channel] &&
(conf->direction & MOST_CH_TX)) hdm_add_padding(mdev, channel, mbo)) {
if (hdm_add_padding(mdev, channel, mbo)) {
retval = -EIO; retval = -EIO;
goto _error; goto _error;
} }
@ -753,18 +752,18 @@ static int hdm_configure_channel(struct most_interface *iface, int channel,
dev_err(dev, "Bad interface or config pointer.\n"); dev_err(dev, "Bad interface or config pointer.\n");
return -EINVAL; return -EINVAL;
} }
if (unlikely((channel < 0) || (channel >= iface->num_channels))) { if (unlikely(channel < 0 || channel >= iface->num_channels)) {
dev_err(dev, "Channel ID out of range.\n"); dev_err(dev, "Channel ID out of range.\n");
return -EINVAL; return -EINVAL;
} }
if ((!conf->num_buffers) || (!conf->buffer_size)) { if (!conf->num_buffers || !conf->buffer_size) {
dev_err(dev, "Misconfig: buffer size or #buffers zero.\n"); dev_err(dev, "Misconfig: buffer size or #buffers zero.\n");
return -EINVAL; return -EINVAL;
} }
if (!(conf->data_type == MOST_CH_SYNC) && if (conf->data_type != MOST_CH_SYNC &&
!((conf->data_type == MOST_CH_ISOC_AVP) && !(conf->data_type == MOST_CH_ISOC_AVP &&
(conf->packets_per_xact != 0xFF))) { conf->packets_per_xact != 0xFF)) {
mdev->padding_active[channel] = false; mdev->padding_active[channel] = false;
goto exit; goto exit;
} }
@ -773,7 +772,7 @@ static int hdm_configure_channel(struct most_interface *iface, int channel,
temp_size = conf->buffer_size; temp_size = conf->buffer_size;
frame_size = get_stream_frame_size(conf); frame_size = get_stream_frame_size(conf);
if ((frame_size == 0) || (frame_size > USB_MTU)) { if (frame_size == 0 || frame_size > USB_MTU) {
dev_warn(dev, "Misconfig: frame size wrong\n"); dev_warn(dev, "Misconfig: frame size wrong\n");
return -EINVAL; return -EINVAL;
} }
@ -909,13 +908,13 @@ static void wq_netinfo(struct work_struct *wq_obj)
if (hdm_update_netinfo(mdev) < 0) if (hdm_update_netinfo(mdev) < 0)
return; return;
if ((prev_link_stat != mdev->link_stat) || if (prev_link_stat != mdev->link_stat ||
(prev_hw_addr[0] != mdev->hw_addr[0]) || prev_hw_addr[0] != mdev->hw_addr[0] ||
(prev_hw_addr[1] != mdev->hw_addr[1]) || prev_hw_addr[1] != mdev->hw_addr[1] ||
(prev_hw_addr[2] != mdev->hw_addr[2]) || prev_hw_addr[2] != mdev->hw_addr[2] ||
(prev_hw_addr[3] != mdev->hw_addr[3]) || prev_hw_addr[3] != mdev->hw_addr[3] ||
(prev_hw_addr[4] != mdev->hw_addr[4]) || prev_hw_addr[4] != mdev->hw_addr[4] ||
(prev_hw_addr[5] != mdev->hw_addr[5])) prev_hw_addr[5] != mdev->hw_addr[5])
most_deliver_netinfo(&mdev->iface, mdev->link_stat, most_deliver_netinfo(&mdev->iface, mdev->link_stat,
&mdev->hw_addr[0]); &mdev->hw_addr[0]);
} }