From: Greg Kroah-Hartman Date: Sat, 28 Feb 2009 04:32:10 +0000 (-0800) Subject: Staging: line6: remove KERNEL_VERSION checks X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=4cb8f302738bd4d1fb5e2b909b735e8826558fbf;p=GitHub%2Fmt8127%2Fandroid_kernel_alcatel_ttab.git Staging: line6: remove KERNEL_VERSION checks As the code is in the kernel tree, it's no longer needed. Cc: Markus Grabner Cc: Mariusz Kozlowski Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/line6/capture.c b/drivers/staging/line6/capture.c index 96ed08a06b99..6660c0b4cc5c 100644 --- a/drivers/staging/line6/capture.c +++ b/drivers/staging/line6/capture.c @@ -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); } } diff --git a/drivers/staging/line6/config.h b/drivers/staging/line6/config.h index 205e697fa90c..8cefdbac9d22 100644 --- a/drivers/staging/line6/config.h +++ b/drivers/staging/line6/config.h @@ -13,12 +13,6 @@ #define CONFIG_H -#include - -#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 19) -#include -#endif - #ifdef CONFIG_USB_DEBUG #define DEBUG 1 #endif diff --git a/drivers/staging/line6/driver.c b/drivers/staging/line6/driver.c index 7c20783b3e58..cf01abcc4676 100644 --- a/drivers/staging/line6/driver.c +++ b/drivers/staging/line6/driver.c @@ -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, diff --git a/drivers/staging/line6/driver.h b/drivers/staging/line6/driver.h index dc081b6cd913..20966534259d 100644 --- a/drivers/staging/line6/driver.h +++ b/drivers/staging/line6/driver.h @@ -18,16 +18,10 @@ #include #include #include - -#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 25) -#include -#endif - #include #include "midi.h" - #define DRIVER_NAME "line6usb" #define LINE6_TIMEOUT 1 diff --git a/drivers/staging/line6/pcm.c b/drivers/staging/line6/pcm.c index 725184b2f308..489d398e65bb 100644 --- a/drivers/staging/line6/pcm.c +++ b/drivers/staging/line6/pcm.c @@ -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); diff --git a/drivers/staging/line6/playback.c b/drivers/staging/line6/playback.c index 4e36f250d4be..c86e89c59f07 100644 --- a/drivers/staging/line6/playback.c +++ b/drivers/staging/line6/playback.c @@ -173,9 +173,6 @@ static void unlink_audio_out_urbs(struct snd_line6_pcm *line6pcm) if(test_bit(i, &line6pcm->active_urb_out)) { if(!test_and_set_bit(i, &line6pcm->unlink_urb_out)) { struct urb *u = line6pcm->urb_audio_out[i]; -#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 14) - u->transfer_flags |= URB_ASYNC_UNLINK; -#endif usb_unlink_urb(u); } } diff --git a/drivers/staging/line6/pod.c b/drivers/staging/line6/pod.c index af18087f1ed1..eba804f2b17c 100644 --- a/drivers/staging/line6/pod.c +++ b/drivers/staging/line6/pod.c @@ -135,15 +135,9 @@ static int pod_version_request_async(struct usb_line6_pod *pod) return line6_send_raw_message_async(&pod->line6, pod->buffer_versionreq, sizeof(pod_request_version)); } -#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 20) static void pod_create_files_work(struct work_struct *work) { struct usb_line6_pod *pod = container_of(work, struct usb_line6_pod, create_files_work); -#else -static void pod_create_files_work(void *work) -{ - struct usb_line6_pod *pod = (struct usb_line6_pod *)work; -#endif pod_create_files(pod->firmware_version, pod->line6.properties->device_bit, pod->line6.ifcdev); } @@ -351,11 +345,7 @@ void pod_process_message(struct usb_line6_pod *pod) /* Now we know the firmware version, so we schedule a bottom half handler to create the special files: */ -#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 20) INIT_WORK(&pod->create_files_work, pod_create_files_work); -#else - INIT_WORK(&pod->create_files_work, pod_create_files_work, pod); -#endif queue_work(line6_workqueue, &pod->create_files_work); } else diff --git a/drivers/staging/line6/usbdefs.h b/drivers/staging/line6/usbdefs.h index cbf5d0d62a1f..15dbca757ac4 100644 --- a/drivers/staging/line6/usbdefs.h +++ b/drivers/staging/line6/usbdefs.h @@ -13,9 +13,6 @@ #define USBDEFS_H -#include - - #define LINE6_VENDOR_ID 0x0e41 #define USB_INTERVALS_PER_SECOND 1000 @@ -65,11 +62,4 @@ #define LINE6_FALLBACK_INTERVAL 10 #define LINE6_FALLBACK_MAXPACKETSIZE 16 - -#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 18) -#define usb_interrupt_msg(usb_dev, pipe, data, len, actual_length, timeout) \ -usb_bulk_msg(usb_dev, pipe, data, len, actual_length, timeout) -#endif - - #endif