* [PATCH 01/18] ALSA: core: Use DIV_ROUND_UP() instead of open-coding it
@ 2020-12-23 17:22 Lars-Peter Clausen
2020-12-23 17:22 ` [PATCH 02/18] ALSA: aloop: " Lars-Peter Clausen
` (17 more replies)
0 siblings, 18 replies; 19+ messages in thread
From: Lars-Peter Clausen @ 2020-12-23 17:22 UTC (permalink / raw)
To: Takashi Iwai; +Cc: alsa-devel, Lars-Peter Clausen
Use DIV_ROUND_UP() instead of open-coding it. This documents intent
and makes it more clear what is going on for the casual reviewer.
Generated using the following the Coccinelle semantic patch.
// <smpl>
@@
expression x, y;
@@
-(((x) + (y) - 1) / (y))
+DIV_ROUND_UP(x, y)
// </smpl>
Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
---
sound/core/control.c | 4 ++--
sound/core/seq/seq_memory.c | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/sound/core/control.c b/sound/core/control.c
index 3b44378b9dec..1571c7f7c43b 100644
--- a/sound/core/control.c
+++ b/sound/core/control.c
@@ -836,7 +836,7 @@ static void fill_remaining_elem_value(struct snd_ctl_elem_value *control,
{
size_t offset = value_sizes[info->type] * info->count;
- offset = (offset + sizeof(u32) - 1) / sizeof(u32);
+ offset = DIV_ROUND_UP(offset, sizeof(u32));
memset32((u32 *)control->value.bytes.data + offset, pattern,
sizeof(control->value) / sizeof(u32) - offset);
}
@@ -928,7 +928,7 @@ static int sanity_check_elem_value(struct snd_card *card,
/* check whether the remaining area kept untouched */
offset = value_sizes[info->type] * info->count;
- offset = (offset + sizeof(u32) - 1) / sizeof(u32);
+ offset = DIV_ROUND_UP(offset, sizeof(u32));
p = (u32 *)control->value.bytes.data + offset;
for (; offset < sizeof(control->value) / sizeof(u32); offset++, p++) {
if (*p != pattern) {
diff --git a/sound/core/seq/seq_memory.c b/sound/core/seq/seq_memory.c
index 65db1a7c77b7..e245bb6ba533 100644
--- a/sound/core/seq/seq_memory.c
+++ b/sound/core/seq/seq_memory.c
@@ -290,7 +290,7 @@ int snd_seq_event_dup(struct snd_seq_pool *pool, struct snd_seq_event *event,
extlen = 0;
if (snd_seq_ev_is_variable(event)) {
extlen = event->data.ext.len & ~SNDRV_SEQ_EXT_MASK;
- ncells = (extlen + sizeof(struct snd_seq_event) - 1) / sizeof(struct snd_seq_event);
+ ncells = DIV_ROUND_UP(extlen, sizeof(struct snd_seq_event));
}
if (ncells >= pool->total_elements)
return -ENOMEM;
--
2.20.1
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [PATCH 02/18] ALSA: aloop: Use DIV_ROUND_UP() instead of open-coding it
2020-12-23 17:22 [PATCH 01/18] ALSA: core: Use DIV_ROUND_UP() instead of open-coding it Lars-Peter Clausen
@ 2020-12-23 17:22 ` Lars-Peter Clausen
2020-12-23 17:22 ` [PATCH 03/18] ALSA: asihpi: " Lars-Peter Clausen
` (16 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: Lars-Peter Clausen @ 2020-12-23 17:22 UTC (permalink / raw)
To: Takashi Iwai; +Cc: alsa-devel, Lars-Peter Clausen
Use DIV_ROUND_UP() instead of open-coding it. This documents intent
and makes it more clear what is going on for the casual reviewer.
Generated using the following the Coccinelle semantic patch.
// <smpl>
@@
expression x, y;
@@
-(((x) + (y) - 1) / (y))
+DIV_ROUND_UP(x, y)
// </smpl>
Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
---
sound/drivers/aloop.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sound/drivers/aloop.c b/sound/drivers/aloop.c
index 702f91b9c60f..8a24e5ae7cef 100644
--- a/sound/drivers/aloop.c
+++ b/sound/drivers/aloop.c
@@ -219,7 +219,7 @@ static int loopback_jiffies_timer_start(struct loopback_pcm *dpcm)
dpcm->period_update_pending = 1;
}
tick = dpcm->period_size_frac - dpcm->irq_pos;
- tick = (tick + dpcm->pcm_bps - 1) / dpcm->pcm_bps;
+ tick = DIV_ROUND_UP(tick, dpcm->pcm_bps);
mod_timer(&dpcm->timer, jiffies + tick);
return 0;
--
2.20.1
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [PATCH 03/18] ALSA: asihpi: Use DIV_ROUND_UP() instead of open-coding it
2020-12-23 17:22 [PATCH 01/18] ALSA: core: Use DIV_ROUND_UP() instead of open-coding it Lars-Peter Clausen
2020-12-23 17:22 ` [PATCH 02/18] ALSA: aloop: " Lars-Peter Clausen
@ 2020-12-23 17:22 ` Lars-Peter Clausen
2020-12-23 17:22 ` [PATCH 04/18] ALSA: bt87x: " Lars-Peter Clausen
` (15 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: Lars-Peter Clausen @ 2020-12-23 17:22 UTC (permalink / raw)
To: Takashi Iwai; +Cc: alsa-devel, Lars-Peter Clausen
Use DIV_ROUND_UP() instead of open-coding it. This documents intent
and makes it more clear what is going on for the casual reviewer.
Generated using the following the Coccinelle semantic patch.
// <smpl>
@@
expression x, y;
@@
-(((x) + (y) - 1) / (y))
+DIV_ROUND_UP(x, y)
// </smpl>
Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
---
sound/pci/asihpi/hpidebug.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sound/pci/asihpi/hpidebug.c b/sound/pci/asihpi/hpidebug.c
index f37856ab05f8..9570d9a44fe8 100644
--- a/sound/pci/asihpi/hpidebug.c
+++ b/sound/pci/asihpi/hpidebug.c
@@ -52,7 +52,7 @@ void hpi_debug_data(u16 *pdata, u32 len)
int lines;
int cols = 8;
- lines = (len + cols - 1) / cols;
+ lines = DIV_ROUND_UP(len, cols);
if (lines > 8)
lines = 8;
--
2.20.1
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [PATCH 04/18] ALSA: bt87x: Use DIV_ROUND_UP() instead of open-coding it
2020-12-23 17:22 [PATCH 01/18] ALSA: core: Use DIV_ROUND_UP() instead of open-coding it Lars-Peter Clausen
2020-12-23 17:22 ` [PATCH 02/18] ALSA: aloop: " Lars-Peter Clausen
2020-12-23 17:22 ` [PATCH 03/18] ALSA: asihpi: " Lars-Peter Clausen
@ 2020-12-23 17:22 ` Lars-Peter Clausen
2020-12-23 17:22 ` [PATCH 05/18] ALSA: cx46xx: " Lars-Peter Clausen
` (14 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: Lars-Peter Clausen @ 2020-12-23 17:22 UTC (permalink / raw)
To: Takashi Iwai; +Cc: alsa-devel, Lars-Peter Clausen
Use DIV_ROUND_UP() instead of open-coding it. This documents intent
and makes it more clear what is going on for the casual reviewer.
Generated using the following the Coccinelle semantic patch.
// <smpl>
@r1@
expression x;
constant C1;
constant C2;
@@
(x + C1) / C2
@script:python@
C1 << r1.C1;
C2 << r1.C2;
@@
try:
if int(C1) != int(C2) - 1:
cocci.include_match(False)
except:
cocci.include_match(False)
@@
expression r1.x;
constant r1.C1;
constant r1.C2;
@@
-(((x) + C1) / C2)
+DIV_ROUND_UP(x, C2)
// </smpl>
Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
---
sound/pci/bt87x.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/sound/pci/bt87x.c b/sound/pci/bt87x.c
index 54cb223caa2f..cf9f8d80a0b6 100644
--- a/sound/pci/bt87x.c
+++ b/sound/pci/bt87x.c
@@ -327,7 +327,8 @@ static irqreturn_t snd_bt87x_interrupt(int irq, void *dev_id)
current_block = chip->current_line * 16 / chip->lines;
irq_block = status >> INT_RISCS_SHIFT;
if (current_block != irq_block)
- chip->current_line = (irq_block * chip->lines + 15) / 16;
+ chip->current_line = DIV_ROUND_UP(irq_block * chip->lines,
+ 16);
snd_pcm_period_elapsed(chip->substream);
}
--
2.20.1
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [PATCH 05/18] ALSA: cx46xx: Use DIV_ROUND_UP() instead of open-coding it
2020-12-23 17:22 [PATCH 01/18] ALSA: core: Use DIV_ROUND_UP() instead of open-coding it Lars-Peter Clausen
` (2 preceding siblings ...)
2020-12-23 17:22 ` [PATCH 04/18] ALSA: bt87x: " Lars-Peter Clausen
@ 2020-12-23 17:22 ` Lars-Peter Clausen
2020-12-23 17:22 ` [PATCH 06/18] ALSA: ctxfi: " Lars-Peter Clausen
` (13 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: Lars-Peter Clausen @ 2020-12-23 17:22 UTC (permalink / raw)
To: Takashi Iwai; +Cc: alsa-devel, Lars-Peter Clausen
Use DIV_ROUND_UP() instead of open-coding it. This documents intent
and makes it more clear what is going on for the casual reviewer.
Generated using the following the Coccinelle semantic patch.
// <smpl>
@@
expression x, y;
@@
-(((x) + (y) - 1) / (y))
+DIV_ROUND_UP(x, y)
// </smpl>
Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
---
sound/pci/cs46xx/cs46xx_lib.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sound/pci/cs46xx/cs46xx_lib.c b/sound/pci/cs46xx/cs46xx_lib.c
index 4490dd7469d9..37f516e6a5c2 100644
--- a/sound/pci/cs46xx/cs46xx_lib.c
+++ b/sound/pci/cs46xx/cs46xx_lib.c
@@ -813,7 +813,7 @@ static void snd_cs46xx_set_capture_sample_rate(struct snd_cs46xx *chip, unsigned
correctionPerGOF = tmp1 / GOF_PER_SEC;
tmp1 -= correctionPerGOF * GOF_PER_SEC;
correctionPerSec = tmp1;
- initialDelay = ((48000 * 24) + rate - 1) / rate;
+ initialDelay = DIV_ROUND_UP(48000 * 24, rate);
/*
* Fill in the VariDecimate control block.
--
2.20.1
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [PATCH 06/18] ALSA: ctxfi: Use DIV_ROUND_UP() instead of open-coding it
2020-12-23 17:22 [PATCH 01/18] ALSA: core: Use DIV_ROUND_UP() instead of open-coding it Lars-Peter Clausen
` (3 preceding siblings ...)
2020-12-23 17:22 ` [PATCH 05/18] ALSA: cx46xx: " Lars-Peter Clausen
@ 2020-12-23 17:22 ` Lars-Peter Clausen
2020-12-23 17:22 ` [PATCH 07/18] ALSA: dummy: " Lars-Peter Clausen
` (12 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: Lars-Peter Clausen @ 2020-12-23 17:22 UTC (permalink / raw)
To: Takashi Iwai; +Cc: alsa-devel, Lars-Peter Clausen
Use DIV_ROUND_UP() instead of open-coding it. This documents intent
and makes it more clear what is going on for the casual reviewer.
Generated using the following the Coccinelle semantic patch.
// <smpl>
@@
expression x, y;
@@
-(((x) + (y) - 1) / (y))
+DIV_ROUND_UP(x, y)
// </smpl>
Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
---
sound/pci/ctxfi/ctresource.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sound/pci/ctxfi/ctresource.c b/sound/pci/ctxfi/ctresource.c
index 61e51e35ba16..6d0a01b189e1 100644
--- a/sound/pci/ctxfi/ctresource.c
+++ b/sound/pci/ctxfi/ctresource.c
@@ -209,7 +209,7 @@ int rsc_mgr_init(struct rsc_mgr *mgr, enum RSCTYP type,
mgr->type = NUM_RSCTYP;
- mgr->rscs = kzalloc(((amount + 8 - 1) / 8), GFP_KERNEL);
+ mgr->rscs = kzalloc(DIV_ROUND_UP(amount, 8), GFP_KERNEL);
if (!mgr->rscs)
return -ENOMEM;
--
2.20.1
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [PATCH 07/18] ALSA: dummy: Use DIV_ROUND_UP() instead of open-coding it
2020-12-23 17:22 [PATCH 01/18] ALSA: core: Use DIV_ROUND_UP() instead of open-coding it Lars-Peter Clausen
` (4 preceding siblings ...)
2020-12-23 17:22 ` [PATCH 06/18] ALSA: ctxfi: " Lars-Peter Clausen
@ 2020-12-23 17:22 ` Lars-Peter Clausen
2020-12-23 17:22 ` [PATCH 08/18] ALSA: emu10k1: " Lars-Peter Clausen
` (11 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: Lars-Peter Clausen @ 2020-12-23 17:22 UTC (permalink / raw)
To: Takashi Iwai; +Cc: alsa-devel, Lars-Peter Clausen
Use DIV_ROUND_UP() instead of open-coding it. This documents intent
and makes it more clear what is going on for the casual reviewer.
Generated using the following the Coccinelle semantic patch.
// <smpl>
@@
expression x, y;
@@
-(((x) + (y) - 1) / (y))
+DIV_ROUND_UP(x, y)
// </smpl>
Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
---
sound/drivers/dummy.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sound/drivers/dummy.c b/sound/drivers/dummy.c
index b5486de08b97..316c9afadefe 100644
--- a/sound/drivers/dummy.c
+++ b/sound/drivers/dummy.c
@@ -236,7 +236,7 @@ struct dummy_systimer_pcm {
static void dummy_systimer_rearm(struct dummy_systimer_pcm *dpcm)
{
mod_timer(&dpcm->timer, jiffies +
- (dpcm->frac_period_rest + dpcm->rate - 1) / dpcm->rate);
+ DIV_ROUND_UP(dpcm->frac_period_rest, dpcm->rate));
}
static void dummy_systimer_update(struct dummy_systimer_pcm *dpcm)
--
2.20.1
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [PATCH 08/18] ALSA: emu10k1: Use DIV_ROUND_UP() instead of open-coding it
2020-12-23 17:22 [PATCH 01/18] ALSA: core: Use DIV_ROUND_UP() instead of open-coding it Lars-Peter Clausen
` (5 preceding siblings ...)
2020-12-23 17:22 ` [PATCH 07/18] ALSA: dummy: " Lars-Peter Clausen
@ 2020-12-23 17:22 ` Lars-Peter Clausen
2020-12-23 17:22 ` [PATCH 09/18] ALSA: hda: Use DIV_ROUND_UP()/roundup() " Lars-Peter Clausen
` (10 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: Lars-Peter Clausen @ 2020-12-23 17:22 UTC (permalink / raw)
To: Takashi Iwai; +Cc: alsa-devel, Lars-Peter Clausen
Use DIV_ROUND_UP() instead of open-coding it. This documents intent
and makes it more clear what is going on for the casual reviewer.
Generated using the following the Coccinelle semantic patch.
// <smpl>
@@
expression x, y;
@@
-(((x) + (y) - 1) / (y))
+DIV_ROUND_UP(x, y)
// </smpl>
Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
---
sound/pci/emu10k1/memory.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sound/pci/emu10k1/memory.c b/sound/pci/emu10k1/memory.c
index 94b8d5b08225..288e0fd2e47d 100644
--- a/sound/pci/emu10k1/memory.c
+++ b/sound/pci/emu10k1/memory.c
@@ -375,7 +375,7 @@ int snd_emu10k1_alloc_pages_maybe_wider(struct snd_emu10k1 *emu, size_t size,
struct snd_dma_buffer *dmab)
{
if (emu->iommu_workaround) {
- size_t npages = (size + PAGE_SIZE - 1) / PAGE_SIZE;
+ size_t npages = DIV_ROUND_UP(size, PAGE_SIZE);
size_t size_real = npages * PAGE_SIZE;
/*
--
2.20.1
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [PATCH 09/18] ALSA: hda: Use DIV_ROUND_UP()/roundup() instead of open-coding it
2020-12-23 17:22 [PATCH 01/18] ALSA: core: Use DIV_ROUND_UP() instead of open-coding it Lars-Peter Clausen
` (6 preceding siblings ...)
2020-12-23 17:22 ` [PATCH 08/18] ALSA: emu10k1: " Lars-Peter Clausen
@ 2020-12-23 17:22 ` Lars-Peter Clausen
2020-12-23 17:22 ` [PATCH 10/18] ALSA: lola: Use DIV_ROUND_UP() " Lars-Peter Clausen
` (9 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: Lars-Peter Clausen @ 2020-12-23 17:22 UTC (permalink / raw)
To: Takashi Iwai; +Cc: alsa-devel, Lars-Peter Clausen
Use DIV_ROUND_UP() and roundup() instead of open-coding them. This
documents intent and makes it more clear what is going on for the casual
reviewer.
Generated using the following the Coccinelle semantic patch.
// <smpl>
@@
expression x, y;
@@
-((((x) + (y) - 1) / (y)) * y)
+roundup(x, y)
@r1@
expression x;
constant C1;
constant C2;
@@
(x + C1) / C2
@script:python@
C1 << r1.C1;
C2 << r1.C2;
@@
print C1, C2
try:
if int(C1) != int(C2) - 1:
cocci.include_match(False)
except:
cocci.include_match(False)
@@
expression r1.x;
constant r1.C1;
constant r1.C2;
@@
-(((x) + C1) / C2)
+DIV_ROUND_UP(x, C2)
// </smpl>
Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
---
sound/hda/hdac_stream.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/sound/hda/hdac_stream.c b/sound/hda/hdac_stream.c
index abe7a1b16fe1..a6ed3dc35f7e 100644
--- a/sound/hda/hdac_stream.c
+++ b/sound/hda/hdac_stream.c
@@ -435,12 +435,11 @@ int snd_hdac_stream_setup_periods(struct hdac_stream *azx_dev)
pos_adj = bus->bdl_pos_adj;
if (!azx_dev->no_period_wakeup && pos_adj > 0) {
pos_align = pos_adj;
- pos_adj = (pos_adj * runtime->rate + 47999) / 48000;
+ pos_adj = DIV_ROUND_UP(pos_adj * runtime->rate, 48000);
if (!pos_adj)
pos_adj = pos_align;
else
- pos_adj = ((pos_adj + pos_align - 1) / pos_align) *
- pos_align;
+ pos_adj = roundup(pos_adj, pos_align);
pos_adj = frames_to_bytes(runtime, pos_adj);
if (pos_adj >= period_bytes) {
dev_warn(bus->dev, "Too big adjustment %d\n",
--
2.20.1
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [PATCH 10/18] ALSA: lola: Use DIV_ROUND_UP() instead of open-coding it
2020-12-23 17:22 [PATCH 01/18] ALSA: core: Use DIV_ROUND_UP() instead of open-coding it Lars-Peter Clausen
` (7 preceding siblings ...)
2020-12-23 17:22 ` [PATCH 09/18] ALSA: hda: Use DIV_ROUND_UP()/roundup() " Lars-Peter Clausen
@ 2020-12-23 17:22 ` Lars-Peter Clausen
2020-12-23 17:22 ` [PATCH 11/18] ALSA: usb: " Lars-Peter Clausen
` (8 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: Lars-Peter Clausen @ 2020-12-23 17:22 UTC (permalink / raw)
To: Takashi Iwai; +Cc: alsa-devel, Lars-Peter Clausen
Use DIV_ROUND_UP() instead of open-coding it. This documents intent
and makes it more clear what is going on for the casual reviewer.
Generated using the following the Coccinelle semantic patch.
// <smpl>
@r1@
expression x;
constant C1;
constant C2;
@@
(x + C1) / C2
@script:python@
C1 << r1.C1;
C2 << r1.C2;
@@
try:
if int(C1) != int(C2) - 1:
cocci.include_match(False)
except:
cocci.include_match(False)
@@
expression r1.x;
constant r1.C1;
constant r1.C2;
@@
-(((x) + C1) / C2)
+DIV_ROUND_UP(x, C2)
// </smpl>
Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
---
sound/pci/lola/lola_clock.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sound/pci/lola/lola_clock.c b/sound/pci/lola/lola_clock.c
index fdb85f256ed5..cafd30e30913 100644
--- a/sound/pci/lola/lola_clock.c
+++ b/sound/pci/lola/lola_clock.c
@@ -135,7 +135,7 @@ int lola_init_clock_widget(struct lola *chip, int nid)
}
nitems = chip->clock.items;
- nb_verbs = (nitems + 3) / 4;
+ nb_verbs = DIV_ROUND_UP(nitems, 4);
idx = 0;
idx_list = 0;
for (i = 0; i < nb_verbs; i++) {
--
2.20.1
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [PATCH 11/18] ALSA: usb: Use DIV_ROUND_UP() instead of open-coding it
2020-12-23 17:22 [PATCH 01/18] ALSA: core: Use DIV_ROUND_UP() instead of open-coding it Lars-Peter Clausen
` (8 preceding siblings ...)
2020-12-23 17:22 ` [PATCH 10/18] ALSA: lola: Use DIV_ROUND_UP() " Lars-Peter Clausen
@ 2020-12-23 17:22 ` Lars-Peter Clausen
2020-12-23 17:22 ` [PATCH 12/18] ALSA: vx: Use roundup() " Lars-Peter Clausen
` (7 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: Lars-Peter Clausen @ 2020-12-23 17:22 UTC (permalink / raw)
To: Takashi Iwai; +Cc: alsa-devel, Lars-Peter Clausen
Use DIV_ROUND_UP() instead of open-coding it. This documents intent
and makes it more clear what is going on for the casual reviewer.
Generated using the following the Coccinelle semantic patch.
// <smpl>
@@
expression x, y;
@@
-(((x) + (y) - 1) / (y))
+DIV_ROUND_UP(x, y)
// </smpl>
Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
---
sound/usb/mixer.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/sound/usb/mixer.c b/sound/usb/mixer.c
index 12b15ed59eaa..412fcd817ecc 100644
--- a/sound/usb/mixer.c
+++ b/sound/usb/mixer.c
@@ -254,7 +254,7 @@ static int get_relative_value(struct usb_mixer_elem_info *cval, int val)
if (val < cval->min)
return 0;
else if (val >= cval->max)
- return (cval->max - cval->min + cval->res - 1) / cval->res;
+ return DIV_ROUND_UP(cval->max - cval->min, cval->res);
else
return (val - cval->min) / cval->res;
}
@@ -1338,7 +1338,7 @@ static int mixer_ctl_feature_info(struct snd_kcontrol *kcontrol,
}
uinfo->value.integer.min = 0;
uinfo->value.integer.max =
- (cval->max - cval->min + cval->res - 1) / cval->res;
+ DIV_ROUND_UP(cval->max - cval->min, cval->res);
}
return 0;
}
--
2.20.1
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [PATCH 12/18] ALSA: vx: Use roundup() instead of open-coding it
2020-12-23 17:22 [PATCH 01/18] ALSA: core: Use DIV_ROUND_UP() instead of open-coding it Lars-Peter Clausen
` (9 preceding siblings ...)
2020-12-23 17:22 ` [PATCH 11/18] ALSA: usb: " Lars-Peter Clausen
@ 2020-12-23 17:22 ` Lars-Peter Clausen
2020-12-23 17:22 ` [PATCH 13/18] ALSA: oss: Use DIV_ROUND_CLOSEST() " Lars-Peter Clausen
` (6 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: Lars-Peter Clausen @ 2020-12-23 17:22 UTC (permalink / raw)
To: Takashi Iwai; +Cc: alsa-devel, Lars-Peter Clausen
Use roundup() instead of open-coding it. This documents intent
and makes it more clear what is going on for the casual reviewer.
Generated using the following the Coccinelle semantic patch.
// <smpl>
@@
expression x, y;
@@
-((((x) + (y) - 1) / (y)) * y)
+roundup(x, y)
// </smpl>
Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
---
sound/drivers/vx/vx_pcm.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/sound/drivers/vx/vx_pcm.c b/sound/drivers/vx/vx_pcm.c
index 3d2e3bcafca8..daffda99b4f7 100644
--- a/sound/drivers/vx/vx_pcm.c
+++ b/sound/drivers/vx/vx_pcm.c
@@ -1154,8 +1154,7 @@ static int vx_init_audio_io(struct vx_core *chip)
chip->ibl.size = 0;
vx_set_ibl(chip, &chip->ibl); /* query the info */
if (preferred > 0) {
- chip->ibl.size = ((preferred + chip->ibl.granularity - 1) /
- chip->ibl.granularity) * chip->ibl.granularity;
+ chip->ibl.size = roundup(preferred, chip->ibl.granularity);
if (chip->ibl.size > chip->ibl.max_size)
chip->ibl.size = chip->ibl.max_size;
} else
--
2.20.1
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [PATCH 13/18] ALSA: oss: Use DIV_ROUND_CLOSEST() instead of open-coding it
2020-12-23 17:22 [PATCH 01/18] ALSA: core: Use DIV_ROUND_UP() instead of open-coding it Lars-Peter Clausen
` (10 preceding siblings ...)
2020-12-23 17:22 ` [PATCH 12/18] ALSA: vx: Use roundup() " Lars-Peter Clausen
@ 2020-12-23 17:22 ` Lars-Peter Clausen
2020-12-23 17:22 ` [PATCH 14/18] ALSA: sonicvibes: " Lars-Peter Clausen
` (5 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: Lars-Peter Clausen @ 2020-12-23 17:22 UTC (permalink / raw)
To: Takashi Iwai; +Cc: alsa-devel, Lars-Peter Clausen
Use DIV_ROUND_CLOSEST() instead of open-coding it. This documents intent
and makes it more clear what is going on for the casual reviewer.
Generated using the following the Coccinelle semantic patch.
// <smpl>
@@
expression x, y;
@@
-((x) + ((y) / 2)) / (y)
+DIV_ROUND_CLOSEST(x, y)
// </smpl>
Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
---
sound/core/oss/mixer_oss.c | 2 +-
sound/core/oss/rate.c | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/sound/core/oss/mixer_oss.c b/sound/core/oss/mixer_oss.c
index f702c96a7478..af5de08f9819 100644
--- a/sound/core/oss/mixer_oss.c
+++ b/sound/core/oss/mixer_oss.c
@@ -418,7 +418,7 @@ static long snd_mixer_oss_conv(long val, long omin, long omax, long nmin, long n
if (orange == 0)
return 0;
- return ((nrange * (val - omin)) + (orange / 2)) / orange + nmin;
+ return DIV_ROUND_CLOSEST(nrange * (val - omin), orange) + nmin;
}
/* convert from alsa native to oss values (0-100) */
diff --git a/sound/core/oss/rate.c b/sound/core/oss/rate.c
index d381f4c967c9..98269119347f 100644
--- a/sound/core/oss/rate.c
+++ b/sound/core/oss/rate.c
@@ -193,7 +193,7 @@ static snd_pcm_sframes_t rate_src_frames(struct snd_pcm_plugin *plugin, snd_pcm_
if (plugin->src_format.rate < plugin->dst_format.rate) {
res = (((frames * data->pitch) + (BITS/2)) >> SHIFT);
} else {
- res = (((frames << SHIFT) + (data->pitch / 2)) / data->pitch);
+ res = DIV_ROUND_CLOSEST(frames << SHIFT, data->pitch);
}
if (data->old_src_frames > 0) {
snd_pcm_sframes_t frames1 = frames, res1 = data->old_dst_frames;
@@ -224,7 +224,7 @@ static snd_pcm_sframes_t rate_dst_frames(struct snd_pcm_plugin *plugin, snd_pcm_
return 0;
data = (struct rate_priv *)plugin->extra_data;
if (plugin->src_format.rate < plugin->dst_format.rate) {
- res = (((frames << SHIFT) + (data->pitch / 2)) / data->pitch);
+ res = DIV_ROUND_CLOSEST(frames << SHIFT, data->pitch);
} else {
res = (((frames * data->pitch) + (BITS/2)) >> SHIFT);
}
--
2.20.1
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [PATCH 14/18] ALSA: sonicvibes: Use DIV_ROUND_CLOSEST() instead of open-coding it
2020-12-23 17:22 [PATCH 01/18] ALSA: core: Use DIV_ROUND_UP() instead of open-coding it Lars-Peter Clausen
` (11 preceding siblings ...)
2020-12-23 17:22 ` [PATCH 13/18] ALSA: oss: Use DIV_ROUND_CLOSEST() " Lars-Peter Clausen
@ 2020-12-23 17:22 ` Lars-Peter Clausen
2020-12-23 17:22 ` [PATCH 15/18] ALSA: trident: " Lars-Peter Clausen
` (4 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: Lars-Peter Clausen @ 2020-12-23 17:22 UTC (permalink / raw)
To: Takashi Iwai; +Cc: alsa-devel, Lars-Peter Clausen
Use DIV_ROUND_CLOSEST() instead of open-coding it. This documents intent
and makes it more clear what is going on for the casual reviewer.
Generated using the following the Coccinelle semantic patch.
// <smpl>
@@
expression x, y;
@@
-((x) + ((y) / 2)) / (y)
+DIV_ROUND_CLOSEST(x, y)
// </smpl>
Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
---
sound/pci/sonicvibes.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sound/pci/sonicvibes.c b/sound/pci/sonicvibes.c
index ecdd54d7a4e1..bd805e416e12 100644
--- a/sound/pci/sonicvibes.c
+++ b/sound/pci/sonicvibes.c
@@ -570,7 +570,7 @@ static void snd_sonicvibes_set_dac_rate(struct sonicvibes * sonic, unsigned int
unsigned int div;
unsigned long flags;
- div = (rate * 65536 + SV_FULLRATE / 2) / SV_FULLRATE;
+ div = DIV_ROUND_CLOSEST(rate * 65536, SV_FULLRATE);
if (div > 65535)
div = 65535;
spin_lock_irqsave(&sonic->reg_lock, flags);
--
2.20.1
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [PATCH 15/18] ALSA: trident: Use DIV_ROUND_CLOSEST() instead of open-coding it
2020-12-23 17:22 [PATCH 01/18] ALSA: core: Use DIV_ROUND_UP() instead of open-coding it Lars-Peter Clausen
` (12 preceding siblings ...)
2020-12-23 17:22 ` [PATCH 14/18] ALSA: sonicvibes: " Lars-Peter Clausen
@ 2020-12-23 17:22 ` Lars-Peter Clausen
2020-12-23 17:22 ` [PATCH 16/18] ALSA: ens1370: " Lars-Peter Clausen
` (3 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: Lars-Peter Clausen @ 2020-12-23 17:22 UTC (permalink / raw)
To: Takashi Iwai; +Cc: alsa-devel, Lars-Peter Clausen
Use DIV_ROUND_CLOSEST() instead of open-coding it. This documents intent
and makes it more clear what is going on for the casual reviewer.
Generated using the following the Coccinelle semantic patch.
// <smpl>
@@
expression x, y;
@@
-((x) + ((y) / 2)) / (y)
+DIV_ROUND_CLOSEST(x, y)
@r1@
expression x;
constant C1;
constant C2;
@@
((x) + C1) / C2
@script:python@
C1 << r1.C1;
C2 << r1.C2;
@@
try:
if int(C1) * 2 != int(C2):
cocci.include_match(False)
except:
cocci.include_match(False)
@@
expression r1.x;
constant r1.C1;
constant r1.C2;
@@
-(((x) + C1) / C2)
+DIV_ROUND_CLOSEST(x, C2)
// </smpl>
Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
---
sound/pci/trident/trident_main.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/sound/pci/trident/trident_main.c b/sound/pci/trident/trident_main.c
index 6e50376163a2..8d0d0d8335ec 100644
--- a/sound/pci/trident/trident_main.c
+++ b/sound/pci/trident/trident_main.c
@@ -678,7 +678,7 @@ static unsigned int snd_trident_convert_rate(unsigned int rate)
else if (rate == 48000)
delta = 0x1000;
else
- delta = (((rate << 12) + 24000) / 48000) & 0x0000ffff;
+ delta = DIV_ROUND_CLOSEST(rate << 12, 48000) & 0x0000ffff;
return delta;
}
@@ -1034,7 +1034,7 @@ static int snd_trident_capture_prepare(struct snd_pcm_substream *substream)
ESO_bytes++;
// Set channel sample rate, 4.12 format
- val = (((unsigned int) 48000L << 12) + (runtime->rate/2)) / runtime->rate;
+ val = DIV_ROUND_CLOSEST(48000U << 12, runtime->rate);
outw(val, TRID_REG(trident, T4D_SBDELTA_DELTA_R));
// Set channel interrupt blk length
--
2.20.1
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [PATCH 16/18] ALSA: ens1370: Use DIV_ROUND_CLOSEST() instead of open-coding it
2020-12-23 17:22 [PATCH 01/18] ALSA: core: Use DIV_ROUND_UP() instead of open-coding it Lars-Peter Clausen
` (13 preceding siblings ...)
2020-12-23 17:22 ` [PATCH 15/18] ALSA: trident: " Lars-Peter Clausen
@ 2020-12-23 17:22 ` Lars-Peter Clausen
2020-12-23 17:22 ` [PATCH 17/18] ALSA: sis7019: " Lars-Peter Clausen
` (2 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: Lars-Peter Clausen @ 2020-12-23 17:22 UTC (permalink / raw)
To: Takashi Iwai; +Cc: alsa-devel, Lars-Peter Clausen
Use DIV_ROUND_CLOSEST() instead of open-coding it. This documents intent
and makes it more clear what is going on for the casual reviewer.
Generated using the following the Coccinelle semantic patch.
// <smpl>
@r1@
expression x;
constant C1;
constant C2;
@@
((x) + C1) / C2
@script:python@
C1 << r1.C1;
C2 << r1.C2;
@@
try:
if int(C1) * 2 != int(C2):
cocci.include_match(False)
except:
cocci.include_match(False)
@@
expression r1.x;
constant r1.C1;
constant r1.C2;
@@
-(((x) + C1) / C2)
+DIV_ROUND_CLOSEST(x, C2)
// </smpl>
Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
---
sound/pci/ens1370.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/sound/pci/ens1370.c b/sound/pci/ens1370.c
index d9acef0826a9..93c4fd313311 100644
--- a/sound/pci/ens1370.c
+++ b/sound/pci/ens1370.c
@@ -752,7 +752,7 @@ static void snd_es1371_dac1_rate(struct ensoniq * ensoniq, unsigned int rate)
unsigned int freq, r;
mutex_lock(&ensoniq->src_mutex);
- freq = ((rate << 15) + 1500) / 3000;
+ freq = DIV_ROUND_CLOSEST(rate << 15, 3000);
r = (snd_es1371_wait_src_ready(ensoniq) & (ES_1371_SRC_DISABLE |
ES_1371_DIS_P2 | ES_1371_DIS_R1)) |
ES_1371_DIS_P1;
@@ -773,7 +773,7 @@ static void snd_es1371_dac2_rate(struct ensoniq * ensoniq, unsigned int rate)
unsigned int freq, r;
mutex_lock(&ensoniq->src_mutex);
- freq = ((rate << 15) + 1500) / 3000;
+ freq = DIV_ROUND_CLOSEST(rate << 15, 3000);
r = (snd_es1371_wait_src_ready(ensoniq) & (ES_1371_SRC_DISABLE |
ES_1371_DIS_P1 | ES_1371_DIS_R1)) |
ES_1371_DIS_P2;
--
2.20.1
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [PATCH 17/18] ALSA: sis7019: Use DIV_ROUND_CLOSEST() instead of open-coding it
2020-12-23 17:22 [PATCH 01/18] ALSA: core: Use DIV_ROUND_UP() instead of open-coding it Lars-Peter Clausen
` (14 preceding siblings ...)
2020-12-23 17:22 ` [PATCH 16/18] ALSA: ens1370: " Lars-Peter Clausen
@ 2020-12-23 17:22 ` Lars-Peter Clausen
2020-12-23 17:22 ` [PATCH 18/18] ALSA: maestro: " Lars-Peter Clausen
2020-12-25 8:16 ` [PATCH 01/18] ALSA: core: Use DIV_ROUND_UP() " Takashi Iwai
17 siblings, 0 replies; 19+ messages in thread
From: Lars-Peter Clausen @ 2020-12-23 17:22 UTC (permalink / raw)
To: Takashi Iwai; +Cc: alsa-devel, Lars-Peter Clausen
Use DIV_ROUND_CLOSEST() instead of open-coding it. This documents intent
and makes it more clear what is going on for the casual reviewer.
Generated using the following the Coccinelle semantic patch.
// <smpl>
@r1@
expression x;
constant C1;
constant C2;
@@
((x) + C1) / C2
@script:python@
C1 << r1.C1;
C2 << r1.C2;
@@
try:
if int(C1) * 2 != int(C2):
cocci.include_match(False)
except:
cocci.include_match(False)
@@
expression r1.x;
constant r1.C1;
constant r1.C2;
@@
-(((x) + C1) / C2)
+DIV_ROUND_CLOSEST(x, C2)
// </smpl>
Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
---
sound/pci/sis7019.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sound/pci/sis7019.c b/sound/pci/sis7019.c
index 7bf6059d50fb..8ffa2f53c0b5 100644
--- a/sound/pci/sis7019.c
+++ b/sound/pci/sis7019.c
@@ -363,7 +363,7 @@ static u32 sis_rate_to_delta(unsigned int rate)
else if (rate == 48000)
delta = 0x1000;
else
- delta = (((rate << 12) + 24000) / 48000) & 0x0000ffff;
+ delta = DIV_ROUND_CLOSEST(rate << 12, 48000) & 0x0000ffff;
return delta;
}
--
2.20.1
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [PATCH 18/18] ALSA: maestro: Use DIV_ROUND_CLOSEST() instead of open-coding it
2020-12-23 17:22 [PATCH 01/18] ALSA: core: Use DIV_ROUND_UP() instead of open-coding it Lars-Peter Clausen
` (15 preceding siblings ...)
2020-12-23 17:22 ` [PATCH 17/18] ALSA: sis7019: " Lars-Peter Clausen
@ 2020-12-23 17:22 ` Lars-Peter Clausen
2020-12-25 8:16 ` [PATCH 01/18] ALSA: core: Use DIV_ROUND_UP() " Takashi Iwai
17 siblings, 0 replies; 19+ messages in thread
From: Lars-Peter Clausen @ 2020-12-23 17:22 UTC (permalink / raw)
To: Takashi Iwai; +Cc: alsa-devel, Lars-Peter Clausen
Use DIV_ROUND_CLOSEST() instead of open-coding it. This documents intent
and makes it more clear what is going on for the casual reviewer.
Generated using the following the Coccinelle semantic patch.
// <smpl>
@r1@
expression x;
constant C1;
constant C2;
@@
((x) + C1) / C2
@script:python@
C1 << r1.C1;
C2 << r1.C2;
@@
try:
if int(C1) * 2 != int(C2):
cocci.include_match(False)
except:
cocci.include_match(False)
@@
expression r1.x;
constant r1.C1;
constant r1.C2;
@@
-(((x) + C1) / C2)
+DIV_ROUND_CLOSEST(x, C2)
// </smpl>
Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
---
sound/pci/maestro3.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sound/pci/maestro3.c b/sound/pci/maestro3.c
index 40232a278b1a..f622c2a6f746 100644
--- a/sound/pci/maestro3.c
+++ b/sound/pci/maestro3.c
@@ -1245,7 +1245,7 @@ static void snd_m3_pcm_setup2(struct snd_m3 *chip, struct m3_dma *s,
snd_pcm_format_width(runtime->format) == 16 ? 0 : 1);
/* set up dac/adc rate */
- freq = ((runtime->rate << 15) + 24000 ) / 48000;
+ freq = DIV_ROUND_CLOSEST(runtime->rate << 15, 48000);
if (freq)
freq--;
--
2.20.1
^ permalink raw reply related [flat|nested] 19+ messages in thread
* Re: [PATCH 01/18] ALSA: core: Use DIV_ROUND_UP() instead of open-coding it
2020-12-23 17:22 [PATCH 01/18] ALSA: core: Use DIV_ROUND_UP() instead of open-coding it Lars-Peter Clausen
` (16 preceding siblings ...)
2020-12-23 17:22 ` [PATCH 18/18] ALSA: maestro: " Lars-Peter Clausen
@ 2020-12-25 8:16 ` Takashi Iwai
17 siblings, 0 replies; 19+ messages in thread
From: Takashi Iwai @ 2020-12-25 8:16 UTC (permalink / raw)
To: Lars-Peter Clausen; +Cc: alsa-devel
On Wed, 23 Dec 2020 18:22:12 +0100,
Lars-Peter Clausen wrote:
>
> Use DIV_ROUND_UP() instead of open-coding it. This documents intent
> and makes it more clear what is going on for the casual reviewer.
>
> Generated using the following the Coccinelle semantic patch.
>
> // <smpl>
> @@
> expression x, y;
> @@
> -(((x) + (y) - 1) / (y))
> +DIV_ROUND_UP(x, y)
> // </smpl>
>
> Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Thanks, applied now for 5.12 with all 18 patches.
Takashi
^ permalink raw reply [flat|nested] 19+ messages in thread
end of thread, other threads:[~2020-12-25 8:17 UTC | newest]
Thread overview: 19+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-12-23 17:22 [PATCH 01/18] ALSA: core: Use DIV_ROUND_UP() instead of open-coding it Lars-Peter Clausen
2020-12-23 17:22 ` [PATCH 02/18] ALSA: aloop: " Lars-Peter Clausen
2020-12-23 17:22 ` [PATCH 03/18] ALSA: asihpi: " Lars-Peter Clausen
2020-12-23 17:22 ` [PATCH 04/18] ALSA: bt87x: " Lars-Peter Clausen
2020-12-23 17:22 ` [PATCH 05/18] ALSA: cx46xx: " Lars-Peter Clausen
2020-12-23 17:22 ` [PATCH 06/18] ALSA: ctxfi: " Lars-Peter Clausen
2020-12-23 17:22 ` [PATCH 07/18] ALSA: dummy: " Lars-Peter Clausen
2020-12-23 17:22 ` [PATCH 08/18] ALSA: emu10k1: " Lars-Peter Clausen
2020-12-23 17:22 ` [PATCH 09/18] ALSA: hda: Use DIV_ROUND_UP()/roundup() " Lars-Peter Clausen
2020-12-23 17:22 ` [PATCH 10/18] ALSA: lola: Use DIV_ROUND_UP() " Lars-Peter Clausen
2020-12-23 17:22 ` [PATCH 11/18] ALSA: usb: " Lars-Peter Clausen
2020-12-23 17:22 ` [PATCH 12/18] ALSA: vx: Use roundup() " Lars-Peter Clausen
2020-12-23 17:22 ` [PATCH 13/18] ALSA: oss: Use DIV_ROUND_CLOSEST() " Lars-Peter Clausen
2020-12-23 17:22 ` [PATCH 14/18] ALSA: sonicvibes: " Lars-Peter Clausen
2020-12-23 17:22 ` [PATCH 15/18] ALSA: trident: " Lars-Peter Clausen
2020-12-23 17:22 ` [PATCH 16/18] ALSA: ens1370: " Lars-Peter Clausen
2020-12-23 17:22 ` [PATCH 17/18] ALSA: sis7019: " Lars-Peter Clausen
2020-12-23 17:22 ` [PATCH 18/18] ALSA: maestro: " Lars-Peter Clausen
2020-12-25 8:16 ` [PATCH 01/18] ALSA: core: Use DIV_ROUND_UP() " Takashi Iwai
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).