ALSA: opl3: remove redundant pointer opl3
authorColin Ian King <colin.king@canonical.com>
Mon, 16 Jul 2018 08:34:51 +0000 (09:34 +0100)
committerTakashi Iwai <tiwai@suse.de>
Mon, 16 Jul 2018 12:29:37 +0000 (14:29 +0200)
Variable opl3 is being assigned but is never used hence it is
redundant and can be removed.

Cleans up several clang warnings:
warning: variable 'opl3' set but not used [-Wunused-but-set-variable]

Signed-off-by: Colin Ian King <colin.king@canonical.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
sound/drivers/opl3/opl3_midi.c
sound/drivers/opl3/opl3_oss.c

index bb3f3a5a69519c77fd06f7d6480607edf75d0f17..71cd5a2fbe824744fac73822152ff541ca7b5f88 100644 (file)
@@ -721,9 +721,6 @@ void snd_opl3_note_off(void *p, int note, int vel,
  */
 void snd_opl3_key_press(void *p, int note, int vel, struct snd_midi_channel *chan)
 {
-       struct snd_opl3 *opl3;
-
-       opl3 = p;
 #ifdef DEBUG_MIDI
        snd_printk(KERN_DEBUG "Key pressure, ch#: %i, inst#: %i\n",
                   chan->number, chan->midi_program);
@@ -735,9 +732,6 @@ void snd_opl3_key_press(void *p, int note, int vel, struct snd_midi_channel *cha
  */
 void snd_opl3_terminate_note(void *p, int note, struct snd_midi_channel *chan)
 {
-       struct snd_opl3 *opl3;
-
-       opl3 = p;
 #ifdef DEBUG_MIDI
        snd_printk(KERN_DEBUG "Terminate note, ch#: %i, inst#: %i\n",
                   chan->number, chan->midi_program);
@@ -861,9 +855,6 @@ void snd_opl3_control(void *p, int type, struct snd_midi_channel *chan)
 void snd_opl3_nrpn(void *p, struct snd_midi_channel *chan,
                   struct snd_midi_channel_set *chset)
 {
-       struct snd_opl3 *opl3;
-
-       opl3 = p;
 #ifdef DEBUG_MIDI
        snd_printk(KERN_DEBUG "NRPN, ch#: %i, inst#: %i\n",
                   chan->number, chan->midi_program);
@@ -876,9 +867,6 @@ void snd_opl3_nrpn(void *p, struct snd_midi_channel *chan,
 void snd_opl3_sysex(void *p, unsigned char *buf, int len,
                    int parsed, struct snd_midi_channel_set *chset)
 {
-       struct snd_opl3 *opl3;
-
-       opl3 = p;
 #ifdef DEBUG_MIDI
        snd_printk(KERN_DEBUG "SYSEX\n");
 #endif
index 22c3e4bca2208937e507672240be53c9eb981038..8a0ce3f43f42ac15b74a6bca9dfa84e994dda51a 100644 (file)
@@ -233,11 +233,8 @@ static int snd_opl3_load_patch_seq_oss(struct snd_seq_oss_arg *arg, int format,
 static int snd_opl3_ioctl_seq_oss(struct snd_seq_oss_arg *arg, unsigned int cmd,
                                  unsigned long ioarg)
 {
-       struct snd_opl3 *opl3;
-
        if (snd_BUG_ON(!arg))
                return -ENXIO;
-       opl3 = arg->private_data;
        switch (cmd) {
                case SNDCTL_FM_LOAD_INSTR:
                        snd_printk(KERN_ERR "OPL3: "
@@ -261,11 +258,8 @@ static int snd_opl3_ioctl_seq_oss(struct snd_seq_oss_arg *arg, unsigned int cmd,
 /* reset device */
 static int snd_opl3_reset_seq_oss(struct snd_seq_oss_arg *arg)
 {
-       struct snd_opl3 *opl3;
-
        if (snd_BUG_ON(!arg))
                return -ENXIO;
-       opl3 = arg->private_data;
 
        return 0;
 }