Skip to contentSkip to conversation

Remove unused functions

PATCH Applied Chris Rorvick 2 participants 5 messages Feb 1, 2015 Sound

lore
Share & tools
lore
#0 lore raw

cover Remove unused functions

Found a couple more things to rip out.

Regards,

Chris

Chris Rorvick (2):
ALSA: line6: Remove unused line6_midibuf_status()
ALSA: line6: Remove unused line6_midibuf_skip_message()

 sound/usb/line6/midibuf.c | 18 ------------------
 1 file changed, 18 deletions(-)
Signature · 1 line
2.1.0
#1 lore raw

PATCH 1/2 ALSA: line6: Remove unused line6_midibuf_status()

This function has not been used since merging the driver into the kernel (and a good while before that.)

---
 sound/usb/line6/midibuf.c | 7 -------
 1 file changed, 7 deletions(-)
sound/usb/line6/midibuf.c +0 -7
index b5c4d79..3b8b59b 100644
@@ -67,13 +67,6 @@ int line6_midibuf_init(struct midi_buffer *this, int size, int split)
 	return 0;
 }
 
-void line6_midibuf_status(struct midi_buffer *this)
-{
-	pr_debug("midibuf size=%d split=%d pos_read=%d pos_write=%d full=%d command_prev=%02x\n",
-		 this->size, this->split, this->pos_read, this->pos_write,
-		 this->full, this->command_prev);
-}
-
 int line6_midibuf_bytes_free(struct midi_buffer *this)
 {
 	return
Signature · 1 line
2.1.0
#2 lore raw

PATCH 2/2 ALSA: line6: Remove unused line6_midibuf_skip_message()

In reply to Chris Rorvick

Use of this function ended with commits 3e58c868db1d ("staging: line6:
drop midi_mask_receive") and af89d2897a71 ("staging: line6: drop midi_mask_transmit".)

---
 sound/usb/line6/midibuf.c | 11 -----------
 1 file changed, 11 deletions(-)
sound/usb/line6/midibuf.c +0 -11
index 3b8b59b..36a610b 100644
@@ -245,17 +245,6 @@ int line6_midibuf_ignore(struct midi_buffer *this, int length)
 	return length;
 }
 
-int line6_midibuf_skip_message(struct midi_buffer *this, unsigned short mask)
-{
-	int cmd = this->command_prev;
-
-	if ((cmd >= 0x80) && (cmd < 0xf0))
-		if ((mask & (1 << (cmd & 0x0f))) == 0)
-			return 1;
-
-	return 0;
-}
-
 void line6_midibuf_destroy(struct midi_buffer *this)
 {
 	kfree(this->buf);
Signature · 1 line
2.1.0
Applied
#3 lore raw
In reply to Chris Rorvick

At Sun, 1 Feb 2015 01:01:07 -0600,

Quoted 2 lines · Chris Rorvick

Found a couple more things to rip out.

Thanks, applied both (with removals of the declarations in midibuf.h, too).

FYI, I'll stop updating topic/line6 branch from now on. Please refer to for-next branch for the further development instead.

Takashi

Quoted 15 lines

Regards,

Chris

Chris Rorvick (2):
ALSA: line6: Remove unused line6_midibuf_status()
ALSA: line6: Remove unused line6_midibuf_skip_message()

 sound/usb/line6/midibuf.c | 18 ------------------
 1 file changed, 18 deletions(-)
Signature · 1 line
2.1.0
#4 lore raw
Quoted 6 lines · Takashi Iwai
Quoted 2 lines · Chris Rorvick

Found a couple more things to rip out.

Thanks, applied both (with removals of the declarations in midibuf.h, too).

Oops, thanks for fixing up.

Regards,

Chris