staging/line6: Remove obsolete code

This patch removes experimental code which is no longer used.

Signed-off-by: Markus Grabner <grabner@icg.tugraz.at>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/staging/line6/capture.c b/drivers/staging/line6/capture.c
index d9da7edf1e7ac24c53a62d4953e896254ef8b9f6..ba441ed1a876727c70871524e2bf26fe55889a6d 100644 (file)
--- a/drivers/staging/line6/capture.c
+++ b/drivers/staging/line6/capture.c
@@ -244,11 +244,7 @@ static void audio_in_callback(struct urb *urb)
                length += fsize;
 
                /* the following assumes LINE6_ISO_PACKETS == 1: */
-#if LINE6_BACKUP_MONITOR_SIGNAL
-               memcpy(line6pcm->prev_fbuf, fbuf, fsize);
-#else
                line6pcm->prev_fbuf = fbuf;
-#endif
                line6pcm->prev_fsize = fsize;
 
 #ifdef CONFIG_LINE6_USB_IMPULSE_RESPONSE

diff --git a/drivers/staging/line6/pcm.c b/drivers/staging/line6/pcm.c
index 2e4e164e81d8f93626fe70b4a683c5cfeee05e8a..a70c0876842f3b0c11fc8da015fea9fbb77fc139 100644 (file)
--- a/drivers/staging/line6/pcm.c
+++ b/drivers/staging/line6/pcm.c
@@ -93,21 +93,7 @@ int line6_pcm_start(struct snd_line6_pcm *line6pcm, int channels)
        unsigned long flags_new = flags_old | channels;
        int err = 0;
 
-#if LINE6_BACKUP_MONITOR_SIGNAL
-       if (!(line6pcm->line6->properties->capabilities & LINE6_BIT_HWMON)) {
-               line6pcm->prev_fbuf =
-                   kmalloc(LINE6_ISO_PACKETS * line6pcm->max_packet_size,
-                           GFP_KERNEL);
-
-               if (!line6pcm->prev_fbuf) {
-                       dev_err(line6pcm->line6->ifcdev,
-                               "cannot malloc monitor buffer\n");
-                       return -ENOMEM;
-               }
-       }
-#else
        line6pcm->prev_fbuf = NULL;
-#endif
 
        if (((flags_old & MASK_CAPTURE) == 0) &&
            ((flags_new & MASK_CAPTURE) != 0)) {
@@ -164,9 +150,6 @@ int line6_pcm_stop(struct snd_line6_pcm *line6pcm, int channels)
            ((flags_new & MASK_PLAYBACK) == 0)) {
                line6_unlink_audio_out_urbs(line6pcm);
        }
-#if LINE6_BACKUP_MONITOR_SIGNAL
-       kfree(line6pcm->prev_fbuf);
-#endif
 
        return 0;
 }

diff --git a/drivers/staging/line6/pcm.h b/drivers/staging/line6/pcm.h
index 77055b3724ad1dac63379aca7b60cc891f305ac2..05f4ef3eced6401bbfe2b745e2ef4dae031e5580 100644 (file)
--- a/drivers/staging/line6/pcm.h
+++ b/drivers/staging/line6/pcm.h
@@ -39,9 +39,6 @@
 #define LINE6_IMPULSE_DEFAULT_PERIOD 100
 #endif
 
-#define LINE6_BACKUP_MONITOR_SIGNAL 0
-#define LINE6_REUSE_DMA_AREA_FOR_PLAYBACK 0
-
 /*
        Get substream from Line6 PCM data structure
 */

diff --git a/drivers/staging/line6/playback.c b/drivers/staging/line6/playback.c
index b3445274072b616d003b9e54a61648c88ce84aa3..e495b32ed7dffffcd485e0d1985c6f6ead033160 100644 (file)
--- a/drivers/staging/line6/playback.c
+++ b/drivers/staging/line6/playback.c
@@ -223,18 +223,10 @@ static int submit_audio_out_urb(struct snd_line6_pcm *line6pcm)
                        } else
                                dev_err(line6pcm->line6->ifcdev, "driver bug: len = %d\n", len);        /* this is somewhat paranoid */
                } else {
-#if LINE6_REUSE_DMA_AREA_FOR_PLAYBACK
-                       /* set the buffer pointer */
-                       urb_out->transfer_buffer =
-                           runtime->dma_area +
-                           line6pcm->pos_out * bytes_per_frame;
-#else
-                       /* copy data */
                        memcpy(urb_out->transfer_buffer,
                               runtime->dma_area +
                               line6pcm->pos_out * bytes_per_frame,
                               urb_out->transfer_buffer_length);
-#endif
                }
 
                line6pcm->pos_out += urb_frames;