2015-02-01 07:01:26

by Chris Rorvick

Subject: [PATCH 0/2] 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(-)

--
2.1.0

2015-02-01 07:01:50

by Chris Rorvick

Subject: [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.)

Signed-off-by: Chris Rorvick <[email protected]>
---
sound/usb/line6/midibuf.c | 7 -------
1 file changed, 7 deletions(-)

diff --git a/sound/usb/line6/midibuf.c b/sound/usb/line6/midibuf.c
index b5c4d79..3b8b59b 100644
--- a/sound/usb/line6/midibuf.c
+++ b/sound/usb/line6/midibuf.c
@@ -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
--
2.1.0

2015-02-01 07:01:27

by Chris Rorvick

Subject: [PATCH 2/2] ALSA: line6: Remove unused line6_midibuf_skip_message()

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

Signed-off-by: Chris Rorvick <[email protected]>
---
sound/usb/line6/midibuf.c | 11 -----------
1 file changed, 11 deletions(-)

diff --git a/sound/usb/line6/midibuf.c b/sound/usb/line6/midibuf.c
index 3b8b59b..36a610b 100644
--- a/sound/usb/line6/midibuf.c
+++ b/sound/usb/line6/midibuf.c
@@ -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);
--
2.1.0

2015-02-01 08:37:20

by Takashi Iwai

Subject: Re: [PATCH 0/2] Remove unused functions

At Sun, 1 Feb 2015 01:01:07 -0600,
Chris Rorvick wrote:
>
> 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

>
> 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(-)
>
> --
> 2.1.0
>

2015-02-01 13:44:29

by Chris Rorvick

Subject: Re: [PATCH 0/2] Remove unused functions

On Sun, Feb 1, 2015 at 2:37 AM, Takashi Iwai <[email protected]> wrote:
> At Sun, 1 Feb 2015 01:01:07 -0600, Chris Rorvick wrote:
>>
>> 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