ALSA: emu10k1: de-duplicate size calculations for 16-bit samples

Instead of repeatedly checking the sample width, assign a size shift
centrally.

Signed-off-by: Oswald Buddenhagen <oswald.buddenhagen@gmx.de>
Message-ID: <20240406064830.1029573-14-oswald.buddenhagen@gmx.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>

diff --git a/sound/pci/emu10k1/emu10k1_patch.c b/sound/pci/emu10k1/emu10k1_patch.c
index ad16de99b8001c671f5f47d3af1ca63e3b0fe906..481fe03fef4dea611165bd7c5cc7fa0a2889b9d7 100644 (file)
--- a/sound/pci/emu10k1/emu10k1_patch.c
+++ b/sound/pci/emu10k1/emu10k1_patch.c
@@ -28,6 +28,7 @@ snd_emu10k1_sample_new(struct snd_emux *rec, struct snd_sf_sample *sp,
 {
        u8 fill;
        u32 xor;
+       int shift;
        int offset;
        int truesize, size, blocksize;
        struct snd_emu10k1 *emu;
@@ -43,9 +44,11 @@ snd_emu10k1_sample_new(struct snd_emux *rec, struct snd_sf_sample *sp,
        }
 
        if (sp->v.mode_flags & SNDRV_SFNT_SAMPLE_8BITS) {
+               shift = 0;
                fill = 0x80;
                xor = (sp->v.mode_flags & SNDRV_SFNT_SAMPLE_UNSIGNED) ? 0 : 0x80808080;
        } else {
+               shift = 1;
                fill = 0;
                xor = (sp->v.mode_flags & SNDRV_SFNT_SAMPLE_UNSIGNED) ? 0x80008000 : 0;
        }
@@ -68,9 +71,7 @@ snd_emu10k1_sample_new(struct snd_emux *rec, struct snd_sf_sample *sp,
        sp->v.loopend += BLANK_HEAD_SIZE;
 
        /* try to allocate a memory block */
-       blocksize = truesize;
-       if (! (sp->v.mode_flags & SNDRV_SFNT_SAMPLE_8BITS))
-               blocksize *= 2;
+       blocksize = truesize << shift;
        sp->block = snd_emu10k1_synth_alloc(emu, blocksize);
        if (sp->block == NULL) {
                dev_dbg(emu->card->dev,
@@ -83,16 +84,12 @@ snd_emu10k1_sample_new(struct snd_emux *rec, struct snd_sf_sample *sp,
 
        /* write blank samples at head */
        offset = 0;
-       size = BLANK_HEAD_SIZE;
-       if (! (sp->v.mode_flags & SNDRV_SFNT_SAMPLE_8BITS))
-               size *= 2;
+       size = BLANK_HEAD_SIZE << shift;
        snd_emu10k1_synth_memset(emu, sp->block, offset, size, fill);
        offset += size;
 
        /* copy provided samples */
-       size = sp->v.size;
-       if (! (sp->v.mode_flags & SNDRV_SFNT_SAMPLE_8BITS))
-               size *= 2;
+       size = sp->v.size << shift;
        if (snd_emu10k1_synth_copy_from_user(emu, sp->block, offset, data, size, xor)) {
                snd_emu10k1_synth_free(emu, sp->block);
                sp->block = NULL;