Commit eeef847d authored by Colin Ian King's avatar Colin Ian King Committed by Takashi Iwai

ALSA: opl3: remove redundant pointer opl3

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: default avatarColin Ian King <colin.king@canonical.com>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent ff2d6acd
...@@ -721,9 +721,6 @@ void snd_opl3_note_off(void *p, int note, int vel, ...@@ -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) 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 #ifdef DEBUG_MIDI
snd_printk(KERN_DEBUG "Key pressure, ch#: %i, inst#: %i\n", snd_printk(KERN_DEBUG "Key pressure, ch#: %i, inst#: %i\n",
chan->number, chan->midi_program); 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 ...@@ -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) void snd_opl3_terminate_note(void *p, int note, struct snd_midi_channel *chan)
{ {
struct snd_opl3 *opl3;
opl3 = p;
#ifdef DEBUG_MIDI #ifdef DEBUG_MIDI
snd_printk(KERN_DEBUG "Terminate note, ch#: %i, inst#: %i\n", snd_printk(KERN_DEBUG "Terminate note, ch#: %i, inst#: %i\n",
chan->number, chan->midi_program); chan->number, chan->midi_program);
...@@ -861,9 +855,6 @@ void snd_opl3_control(void *p, int type, struct snd_midi_channel *chan) ...@@ -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, void snd_opl3_nrpn(void *p, struct snd_midi_channel *chan,
struct snd_midi_channel_set *chset) struct snd_midi_channel_set *chset)
{ {
struct snd_opl3 *opl3;
opl3 = p;
#ifdef DEBUG_MIDI #ifdef DEBUG_MIDI
snd_printk(KERN_DEBUG "NRPN, ch#: %i, inst#: %i\n", snd_printk(KERN_DEBUG "NRPN, ch#: %i, inst#: %i\n",
chan->number, chan->midi_program); chan->number, chan->midi_program);
...@@ -876,9 +867,6 @@ void snd_opl3_nrpn(void *p, struct snd_midi_channel *chan, ...@@ -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, void snd_opl3_sysex(void *p, unsigned char *buf, int len,
int parsed, struct snd_midi_channel_set *chset) int parsed, struct snd_midi_channel_set *chset)
{ {
struct snd_opl3 *opl3;
opl3 = p;
#ifdef DEBUG_MIDI #ifdef DEBUG_MIDI
snd_printk(KERN_DEBUG "SYSEX\n"); snd_printk(KERN_DEBUG "SYSEX\n");
#endif #endif
......
...@@ -233,11 +233,8 @@ static int snd_opl3_load_patch_seq_oss(struct snd_seq_oss_arg *arg, int format, ...@@ -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, static int snd_opl3_ioctl_seq_oss(struct snd_seq_oss_arg *arg, unsigned int cmd,
unsigned long ioarg) unsigned long ioarg)
{ {
struct snd_opl3 *opl3;
if (snd_BUG_ON(!arg)) if (snd_BUG_ON(!arg))
return -ENXIO; return -ENXIO;
opl3 = arg->private_data;
switch (cmd) { switch (cmd) {
case SNDCTL_FM_LOAD_INSTR: case SNDCTL_FM_LOAD_INSTR:
snd_printk(KERN_ERR "OPL3: " 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, ...@@ -261,11 +258,8 @@ static int snd_opl3_ioctl_seq_oss(struct snd_seq_oss_arg *arg, unsigned int cmd,
/* reset device */ /* reset device */
static int snd_opl3_reset_seq_oss(struct snd_seq_oss_arg *arg) static int snd_opl3_reset_seq_oss(struct snd_seq_oss_arg *arg)
{ {
struct snd_opl3 *opl3;
if (snd_BUG_ON(!arg)) if (snd_BUG_ON(!arg))
return -ENXIO; return -ENXIO;
opl3 = arg->private_data;
return 0; return 0;
} }
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment