Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4cb8f302 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Staging: line6: remove KERNEL_VERSION checks 



As the code is in the kernel tree, it's no longer needed.

Cc: Markus Grabner <grabner@icg.tugraz.at>
Cc: Mariusz Kozlowski <m.kozlowski@tuxland.pl>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 0c7ab158

drivers/staging/line6/capture.c

+0 −3
Original line number Diff line number Diff line
@@ -88,9 +88,6 @@ static void unlink_audio_in_urbs(struct snd_line6_pcm *line6pcm) 
		if(test_bit(i, &line6pcm->active_urb_in)) {

			if(!test_and_set_bit(i, &line6pcm->unlink_urb_in)) {

				struct urb *u = line6pcm->urb_audio_in[i];

#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 14)

				u->transfer_flags |= URB_ASYNC_UNLINK;

#endif

				usb_unlink_urb(u);

			}

		}

drivers/staging/line6/config.h

+0 −6
Original line number Diff line number Diff line
@@ -13,12 +13,6 @@ 
#define CONFIG_H





#include <linux/version.h>



#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 19)

#include <linux/config.h>

#endif



#ifdef CONFIG_USB_DEBUG

#define DEBUG 1

#endif

drivers/staging/line6/driver.c

+0 −3
Original line number Diff line number Diff line
@@ -1000,9 +1000,6 @@ static void line6_disconnect(struct usb_interface *interface) 
}



static struct usb_driver line6_driver = {

#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 16)

	.owner = THIS_MODULE,

#endif

	.name = DRIVER_NAME,

	.probe = line6_probe,

	.disconnect = line6_disconnect,

drivers/staging/line6/driver.h

+0 −6
Original line number Diff line number Diff line
@@ -18,16 +18,10 @@ 
#include <linux/spinlock.h>

#include <linux/usb.h>

#include <linux/wait.h>



#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 25)

#include <sound/driver.h>

#endif



#include <sound/core.h>



#include "midi.h"





#define DRIVER_NAME "line6usb"



#define LINE6_TIMEOUT 1

drivers/staging/line6/pcm.c

+0 −8
Original line number Diff line number Diff line
@@ -26,9 +26,6 @@ 
int snd_line6_trigger(struct snd_pcm_substream *substream, int cmd)

{

	struct snd_line6_pcm *line6pcm = snd_pcm_substream_chip(substream);

#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 22)

	struct list_head *pos;

#endif

	struct snd_pcm_substream *s;

	int err;

	unsigned long flags;
@@ -36,12 +33,7 @@ int snd_line6_trigger(struct snd_pcm_substream *substream, int cmd) 
	spin_lock_irqsave(&line6pcm->lock_trigger, flags);

	clear_bit(BIT_PREPARED, &line6pcm->flags);



#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 22)

	snd_pcm_group_for_each(pos, substream) {

		s = snd_pcm_group_substream_entry(pos);

#else

	snd_pcm_group_for_each_entry(s, substream) {

#endif

		switch(s->stream) {

		case SNDRV_PCM_STREAM_PLAYBACK:

			err = snd_line6_playback_trigger(s, cmd);