summaryrefslogtreecommitdiff
path: root/sound/firewire
diff options
context:
space:
mode:
authorTakashi Sakamoto <o-takashi@sakamocchi.jp>2014-11-29 00:59:10 +0900
committerTakashi Iwai <tiwai@suse.de>2014-11-29 20:02:48 +0100
commit81fc5ad51539e765cd470f1d0d9d0477d1c4c30c (patch)
tree428f1df51b289184230ad8dd709e0551d15baca1 /sound/firewire
parent50314663877b3c5f08b2573c0bb161b6a2c63c3e (diff)
downloadkernel-81fc5ad51539e765cd470f1d0d9d0477d1c4c30c.tar.gz
ALSA: dice: suppress checkpatch.pl warnings
The checkpatch.pl generates some warnings due to: - C99 comment - a line over 80 characters - min() for parameters with different types Signed-off-by: Takashi Sakamoto <o-takashi@sakamocchi.jp> Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/firewire')
-rw-r--r--sound/firewire/dice.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/sound/firewire/dice.c b/sound/firewire/dice.c
index e3a04d69c853..72af110d0f98 100644
--- a/sound/firewire/dice.c
+++ b/sound/firewire/dice.c
@@ -133,7 +133,7 @@ static inline u64 global_address(struct dice *dice, unsigned int offset)
return DICE_PRIVATE_SPACE + dice->global_offset + offset;
}
-// TODO: rx index
+/* TODO: rx index */
static inline u64 rx_address(struct dice *dice, unsigned int offset)
{
return DICE_PRIVATE_SPACE + dice->rx_offset + offset;
@@ -721,13 +721,14 @@ static long dice_hwdep_read(struct snd_hwdep *hwdep, char __user *buf,
event.lock_status.status = dice->dev_lock_count > 0;
dice->dev_lock_changed = false;
- count = min(count, (long)sizeof(event.lock_status));
+ count = min_t(long, count, sizeof(event.lock_status));
} else {
- event.dice_notification.type = SNDRV_FIREWIRE_EVENT_DICE_NOTIFICATION;
+ event.dice_notification.type =
+ SNDRV_FIREWIRE_EVENT_DICE_NOTIFICATION;
event.dice_notification.notification = dice->notification_bits;
dice->notification_bits = 0;
- count = min(count, (long)sizeof(event.dice_notification));
+ count = min_t(long, count, sizeof(event.dice_notification));
}
spin_unlock_irq(&dice->lock);