ALSA: emux: prune unused parameter from snd_soundfont_load_guspatch()

The `client` parameter was not used, so eliminate it from the call
chain.

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

diff --git a/include/sound/soundfont.h b/include/sound/soundfont.h
index e445688a4f4f9b369c7bd9479da9848c345d4ae7..98ed98d89d6de0dfe75603921bfac611ec59c2db 100644 (file)
--- a/include/sound/soundfont.h
+++ b/include/sound/soundfont.h
@@ -89,7 +89,7 @@ struct snd_sf_list {
 int snd_soundfont_load(struct snd_sf_list *sflist, const void __user *data,
                       long count, int client);
 int snd_soundfont_load_guspatch(struct snd_sf_list *sflist, const char __user *data,
-                               long count, int client);
+                               long count);
 int snd_soundfont_close_check(struct snd_sf_list *sflist, int client);
 
 struct snd_sf_list *snd_sf_new(struct snd_sf_callback *callback,

diff --git a/sound/synth/emux/emux_hwdep.c b/sound/synth/emux/emux_hwdep.c
index 81719bfb8ed738c32f9a5f4c3894f1d628bc5f32..fd8f978cde1c6c2b40edd3516124edc90711a69e 100644 (file)
--- a/sound/synth/emux/emux_hwdep.c
+++ b/sound/synth/emux/emux_hwdep.c
@@ -27,8 +27,7 @@ snd_emux_hwdep_load_patch(struct snd_emux *emu, void __user *arg)
 
        if (patch.key == GUS_PATCH)
                return snd_soundfont_load_guspatch(emu->sflist, arg,
-                                                  patch.len + sizeof(patch),
-                                                  TMP_CLIENT_ID);
+                                                  patch.len + sizeof(patch));
 
        if (patch.type >= SNDRV_SFNT_LOAD_INFO &&
            patch.type <= SNDRV_SFNT_PROBE_DATA) {

diff --git a/sound/synth/emux/emux_oss.c b/sound/synth/emux/emux_oss.c
index d8d32671f7038e65ba39294fc9b961e2eb91db20..04df46b269d375ba8f47afed9a216403040eaf31 100644 (file)
--- a/sound/synth/emux/emux_oss.c
+++ b/sound/synth/emux/emux_oss.c
@@ -205,8 +205,7 @@ snd_emux_load_patch_seq_oss(struct snd_seq_oss_arg *arg, int format,
                return -ENXIO;
 
        if (format == GUS_PATCH)
-               rc = snd_soundfont_load_guspatch(emu->sflist, buf, count,
-                                                SF_CLIENT_NO(p->chset.port));
+               rc = snd_soundfont_load_guspatch(emu->sflist, buf, count);
        else if (format == SNDRV_OSS_SOUNDFONT_PATCH) {
                struct soundfont_patch_info patch;
                if (count < (int)sizeof(patch))

diff --git a/sound/synth/emux/soundfont.c b/sound/synth/emux/soundfont.c
index 16f00097cb95a87bec0e75077ca1928dbae5d407..e1e47518ac92c54a741219e39cfae96a828fd4aa 100644 (file)
--- a/sound/synth/emux/soundfont.c
+++ b/sound/synth/emux/soundfont.c
@@ -941,8 +941,7 @@ int snd_sf_vol_table[128] = {
 
 /* load GUS patch */
 static int
-load_guspatch(struct snd_sf_list *sflist, const char __user *data,
-             long count, int client)
+load_guspatch(struct snd_sf_list *sflist, const char __user *data, long count)
 {
        struct patch_info patch;
        struct snd_soundfont *sf;
@@ -1122,11 +1121,11 @@ load_guspatch(struct snd_sf_list *sflist, const char __user *data,
 /* load GUS patch */
 int
 snd_soundfont_load_guspatch(struct snd_sf_list *sflist, const char __user *data,
-                           long count, int client)
+                           long count)
 {
        int rc;
        lock_preset(sflist);
-       rc = load_guspatch(sflist, data, count, client);
+       rc = load_guspatch(sflist, data, count);
        unlock_preset(sflist);
        return rc;
 }