[alsa-devel] [PATCH RESEND 1/4] sound/onyx: remove redundant case entry
Case ti->tag == 0 can be included in the last return, remove it.
No functional change.
Signed-off-by: Yaowei Bai bywxiaobai@163.com --- sound/aoa/codecs/onyx.c | 1 - 1 file changed, 1 deletion(-)
diff --git a/sound/aoa/codecs/onyx.c b/sound/aoa/codecs/onyx.c index a04edff..a407e1f 100644 --- a/sound/aoa/codecs/onyx.c +++ b/sound/aoa/codecs/onyx.c @@ -683,7 +683,6 @@ static int onyx_usable(struct codec_info_item *cii, mutex_unlock(&onyx->mutex);
switch (ti->tag) { - case 0: return 1; case 1: return analog_enabled; case 2: return spdif_enabled; }
Make 'return' stay in a singe line.
No functional change.
Signed-off-by: Yaowei Bai bywxiaobai@163.com --- sound/aoa/soundbus/i2sbus/core.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/sound/aoa/soundbus/i2sbus/core.c b/sound/aoa/soundbus/i2sbus/core.c index 1cbf210..6f216c0 100644 --- a/sound/aoa/soundbus/i2sbus/core.c +++ b/sound/aoa/soundbus/i2sbus/core.c @@ -62,7 +62,8 @@ static int alloc_dbdma_descriptor_ring(struct i2sbus_dev *i2sdev, static void free_dbdma_descriptor_ring(struct i2sbus_dev *i2sdev, struct dbdma_command_mem *r) { - if (!r->space) return; + if (!r->space) + return;
dma_free_coherent(&macio_get_pci_dev(i2sdev->macio)->dev, r->size, r->space, r->bus_addr);
Catching the return value of soundbus_register_driver in aoa_fabric_layout_init is not necessary, let's return it directly.
No functional change.
Signed-off-by: Yaowei Bai bywxiaobai@163.com --- sound/aoa/fabrics/layout.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-)
diff --git a/sound/aoa/fabrics/layout.c b/sound/aoa/fabrics/layout.c index 8f71f7e..b6ba091 100644 --- a/sound/aoa/fabrics/layout.c +++ b/sound/aoa/fabrics/layout.c @@ -1161,12 +1161,7 @@ static struct soundbus_driver aoa_soundbus_driver = {
static int __init aoa_fabric_layout_init(void) { - int err; - - err = soundbus_register_driver(&aoa_soundbus_driver); - if (err) - return err; - return 0; + return soundbus_register_driver(&aoa_soundbus_driver); }
static void __exit aoa_fabric_layout_exit(void)
This patch makes prioq_match return bool due to this particular function only using either one or zero as its return value.
No functional change.
Change from v1: fix indentation to line up properly (Johannes Berg)
Signed-off-by: Yaowei Bai bywxiaobai@163.com --- sound/core/seq/seq_prioq.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/sound/core/seq/seq_prioq.c b/sound/core/seq/seq_prioq.c index bc1c848..95d0e2c 100644 --- a/sound/core/seq/seq_prioq.c +++ b/sound/core/seq/seq_prioq.c @@ -264,26 +264,26 @@ struct snd_seq_event_cell *snd_seq_prioq_cell_peek(struct snd_seq_prioq * f) }
-static inline int prioq_match(struct snd_seq_event_cell *cell, - int client, int timestamp) +static inline bool prioq_match(struct snd_seq_event_cell *cell, + int client, int timestamp) { if (cell->event.source.client == client || cell->event.dest.client == client) - return 1; + return true; if (!timestamp) - return 0; + return false; switch (cell->event.flags & SNDRV_SEQ_TIME_STAMP_MASK) { case SNDRV_SEQ_TIME_STAMP_TICK: if (cell->event.time.tick) - return 1; + return true; break; case SNDRV_SEQ_TIME_STAMP_REAL: if (cell->event.time.time.tv_sec || cell->event.time.time.tv_nsec) - return 1; + return true; break; } - return 0; + return false; }
/* remove cells for left client */
participants (1)
-
Yaowei Bai