Fix build errors with 2.6.37-rc1 update

Refreshed patch, added noop_llseek compat definition for older kernels.

Signed-off-by: Takashi Iwai <tiwai@suse.de>

6 files changed, 52 insertions, 47 deletions

diff --git a/acore/init.patch b/acore/init.patch
index fbd479626..b53084dfc 100644
--- a/acore/init.patch
+++ b/acore/init.patch
@@ -1,12 +1,12 @@
---- ../alsa-kernel/core/init.c	2009-09-07 15:59:08.000000000 +0200
-+++ init.c	2009-09-07 16:04:43.000000000 +0200
+--- ../alsa-kernel/core/init.c	2010-11-02 16:17:52.267995721 +0100
++++ init.c	2010-11-02 16:47:32.709413929 +0100
 @@ -1,3 +1,5 @@
 +#define __NO_VERSION__
 +#include "adriver.h"
  /*
   *  Initialization routines
   *  Copyright (c) by Jaroslav Kysela <perex@perex.cz>
-@@ -296,11 +298,19 @@
+@@ -296,11 +298,19 @@ static unsigned int snd_disconnect_poll(
  	return POLLERR | POLLNVAL;
  }
  
@@ -26,7 +26,7 @@
  
  static int snd_disconnect_mmap(struct file *file, struct vm_area_struct *vma)
  {
-@@ -314,16 +324,22 @@
+@@ -314,16 +324,22 @@ static int snd_disconnect_fasync(int fd,
  
  static const struct file_operations snd_shutdown_f_ops =
  {
@@ -49,9 +49,9 @@
  	.mmap =		snd_disconnect_mmap,
  	.fasync =	snd_disconnect_fasync
  };
-@@ -651,9 +667,21 @@
+@@ -652,9 +668,21 @@ int snd_card_register(struct snd_card *c
  		return -EINVAL;
- #ifndef CONFIG_SYSFS_DEPRECATED
+ 
  	if (!card->card_dev) {
 +#ifdef CONFIG_SND_HAS_DEVICE_CREATE_DRVDATA
 +		card->card_dev = device_create_drvdata(sound_class, card->dev,
@@ -71,7 +71,7 @@
  		if (IS_ERR(card->card_dev))
  			card->card_dev = NULL;
  	}
-@@ -945,3 +973,16 @@
+@@ -945,3 +973,16 @@ int snd_power_wait(struct snd_card *card
  
  EXPORT_SYMBOL(snd_power_wait);
  #endif /* CONFIG_PM */
diff --git a/acore/seq/oss/seq_oss.patch b/acore/seq/oss/seq_oss.patch
index adef3aa33..d60e0d3fd 100644
--- a/acore/seq/oss/seq_oss.patch
+++ b/acore/seq/oss/seq_oss.patch
@@ -1,5 +1,5 @@
---- ../../../alsa-kernel/core/seq/oss/seq_oss.c	2007-12-20 10:19:26.000000000 +0100
-+++ seq_oss.c	2007-12-20 10:54:07.000000000 +0100
+--- ../../../alsa-kernel/core/seq/oss/seq_oss.c	2010-11-02 16:17:52.267995721 +0100
++++ seq_oss.c	2010-11-02 16:44:24.529719247 +0100
 @@ -1,3 +1,4 @@
 +#include "adriver.h"
  /*
@@ -13,7 +13,7 @@
  #include <linux/moduleparam.h>
  #include <linux/mutex.h>
  #include <sound/core.h>
-@@ -187,12 +189,25 @@
+@@ -190,12 +192,25 @@ odev_ioctl(struct file *file, unsigned i
  	return snd_seq_oss_ioctl(dp, cmd, arg);
  }
  
@@ -40,7 +40,7 @@
  static unsigned int
  odev_poll(struct file *file, poll_table * wait)
  {
-@@ -208,14 +223,20 @@
+@@ -212,14 +227,20 @@ odev_poll(struct file *file, poll_table
  
  static const struct file_operations seq_oss_f_ops =
  {
@@ -58,10 +58,10 @@
 +#else
 +	.ioctl =	odev_ioctl_old,
 +#endif
+ 	.llseek =	noop_llseek,
  };
  
- static int __init
-@@ -305,3 +326,5 @@
+@@ -310,3 +331,5 @@ unregister_proc(void)
  	info_entry = NULL;
  }
  #endif /* CONFIG_PROC_FS */
diff --git a/acore/sound.patch b/acore/sound.patch
index 849a7f85e..d7d213308 100644
--- a/acore/sound.patch
+++ b/acore/sound.patch
@@ -1,5 +1,5 @@
---- ../alsa-kernel/core/sound.c	2010-01-14 21:24:42.000000000 +0100
-+++ sound.c	2010-01-14 21:26:59.000000000 +0100
+--- ../alsa-kernel/core/sound.c	2010-11-02 16:17:52.267995721 +0100
++++ sound.c	2010-11-02 16:41:56.188267664 +0100
 @@ -1,3 +1,4 @@
 +#include "adriver.h"
  /*
@@ -26,17 +26,17 @@
  MODULE_ALIAS_CHARDEV_MAJOR(CONFIG_SND_MAJOR);
  
  /* this one holds the actual max. card number currently available.
-@@ -180,7 +188,9 @@
+@@ -183,7 +191,9 @@
  
  static const struct file_operations snd_fops =
  {
 +#ifndef LINUX_2_2
  	.owner =	THIS_MODULE,
 +#endif
- 	.open =		snd_open
+ 	.open =		snd_open,
+ 	.llseek =	noop_llseek,
  };
- 
-@@ -256,7 +266,11 @@
+@@ -260,7 +270,11 @@
  
  	if (snd_BUG_ON(!name))
  		return -EINVAL;
@@ -48,7 +48,7 @@
  	if (preg == NULL)
  		return -ENOMEM;
  	preg->type = type;
-@@ -264,6 +278,9 @@
+@@ -268,6 +282,9 @@
  	preg->device = dev;
  	preg->f_ops = f_ops;
  	preg->private_data = private_data;
@@ -58,7 +58,7 @@
  	mutex_lock(&sound_mutex);
  #ifdef CONFIG_SND_DYNAMIC_MINORS
  	minor = snd_find_free_minor();
-@@ -278,8 +295,23 @@
+@@ -282,8 +299,23 @@
  		return minor;
  	}
  	snd_minors[minor] = preg;
@@ -82,7 +82,7 @@
  	if (IS_ERR(preg->dev)) {
  		snd_minors[minor] = NULL;
  		mutex_unlock(&sound_mutex);
-@@ -287,6 +319,22 @@
+@@ -291,6 +323,22 @@
  		kfree(preg);
  		return minor;
  	}
@@ -105,7 +105,7 @@
  
  	mutex_unlock(&sound_mutex);
  	return 0;
-@@ -326,6 +374,9 @@
+@@ -330,6 +378,9 @@
  int snd_unregister_device(int type, struct snd_card *card, int dev)
  {
  	int minor;
@@ -115,7 +115,7 @@
  
  	mutex_lock(&sound_mutex);
  	minor = find_snd_minor(type, card, dev);
-@@ -334,7 +385,20 @@
+@@ -338,7 +389,20 @@
  		return -EINVAL;
  	}
  
@@ -136,7 +136,7 @@
  
  	kfree(snd_minors[minor]);
  	snd_minors[minor] = NULL;
-@@ -347,16 +411,28 @@
+@@ -351,16 +415,28 @@
  int snd_add_device_sysfs_file(int type, struct snd_card *card, int dev,
  			      struct device_attribute *attr)
  {
@@ -166,7 +166,7 @@
  }
  
  EXPORT_SYMBOL(snd_add_device_sysfs_file);
-@@ -442,31 +518,80 @@
+@@ -446,31 +522,80 @@
   *  INIT PART
   */
  
diff --git a/include/adriver.h b/include/adriver.h
index 495e6404f..35418e1cb 100644
--- a/include/adriver.h
+++ b/include/adriver.h
@@ -1896,6 +1896,11 @@ blocking_notifier_chain_unregister(struct blocking_notifier_head *nh,
 #define no_llseek	NULL
 #endif
 
+/* noop_llseek() */
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 35)
+#define noop_llseek	NULL
+#endif
+
 /* nonseekable_open() */
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 8)
 #define nonseekable_open(i,f) 0
diff --git a/usb/caiaq/input.patch b/usb/caiaq/input.patch
index 60cd7fc76..686464633 100644
--- a/usb/caiaq/input.patch
+++ b/usb/caiaq/input.patch
@@ -1,13 +1,13 @@
---- ../../alsa-kernel/usb/caiaq/input.c	2010-03-22 16:10:59.103773419 +0100
-+++ input.c	2010-03-22 18:06:20.773262057 +0100
+--- ../../alsa-kernel/usb/caiaq/input.c	2010-09-30 23:00:05.768410444 +0200
++++ input.c	2010-11-02 16:47:34.561332208 +0100
 @@ -1,3 +1,5 @@
 +#include "adriver.h"
 +#include "../usbcompat.h"
  /*
   *   Copyright (c) 2006,2007 Daniel Mack, Tim Ruetz
   *
-@@ -18,13 +20,30 @@
- 
+@@ -19,13 +21,30 @@
+ #include <linux/gfp.h>
  #include <linux/init.h>
  #include <linux/usb.h>
 +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 18)
@@ -37,7 +37,7 @@
  static unsigned short keycode_ak1[] =  { KEY_C, KEY_B, KEY_A };
  static unsigned short keycode_rk2[] =  { KEY_1, KEY_2, KEY_3, KEY_4,
  					 KEY_5, KEY_6, KEY_7 };
-@@ -281,7 +300,11 @@
+@@ -436,7 +455,11 @@ requeue:
  
  static int snd_usb_caiaq_input_open(struct input_dev *idev)
  {
@@ -49,7 +49,7 @@
  
  	if (!dev)
  		return -EINVAL;
-@@ -298,7 +321,11 @@
+@@ -454,7 +477,11 @@ static int snd_usb_caiaq_input_open(stru
  
  static void snd_usb_caiaq_input_close(struct input_dev *idev)
  {
@@ -61,7 +61,7 @@
  
  	if (!dev)
  		return;
-@@ -336,7 +363,11 @@
+@@ -493,7 +520,11 @@ int snd_usb_caiaq_input_init(struct snd_
  	struct input_dev *input;
  	int i, ret = 0;
  
@@ -73,7 +73,7 @@
  	if (!input)
  		return -ENOMEM;
  
-@@ -346,9 +377,17 @@
+@@ -503,9 +534,17 @@ int snd_usb_caiaq_input_init(struct snd_
  	input->name = dev->product_name;
  	input->phys = dev->phys;
  	usb_to_input_id(usb_dev, &input->id);
@@ -91,7 +91,7 @@
  
  	switch (dev->chip.usb_id) {
  	case USB_ID(USB_VID_NATIVEINSTRUMENTS, USB_PID_RIGKONTROL2):
-@@ -467,9 +506,13 @@
+@@ -664,9 +703,13 @@ int snd_usb_caiaq_input_init(struct snd_
  	for (i = 0; i < input->keycodemax; i++)
  		__set_bit(dev->keycode[i], input->keybit);
  
diff --git a/usb/midi.patch b/usb/midi.patch
index 68887907d..d584274fd 100644
--- a/usb/midi.patch
+++ b/usb/midi.patch
@@ -1,12 +1,12 @@
---- ../alsa-kernel/usb/midi.c	2010-03-10 09:22:24.488022926 +0100
-+++ midi.c	2010-03-10 09:26:34.028022239 +0100
+--- ../alsa-kernel/usb/midi.c	2010-10-23 17:00:26.073707353 +0200
++++ midi.c	2010-11-02 16:47:34.469336266 +0100
 @@ -1,3 +1,5 @@
 +#include "midi.inc"
 +
  /*
   * usbmidi.c - ALSA USB MIDI driver
   *
-@@ -246,7 +248,11 @@
+@@ -246,7 +248,11 @@ static void dump_urb(const char *type, c
  /*
   * Processes the data read from the device.
   */
@@ -18,7 +18,7 @@
  {
  	struct snd_usb_midi_in_endpoint* ep = urb->context;
  
-@@ -270,7 +276,11 @@
+@@ -270,7 +276,11 @@ static void snd_usbmidi_in_urb_complete(
  	snd_usbmidi_submit_urb(urb, GFP_ATOMIC);
  }
  
@@ -30,7 +30,7 @@
  {
  	struct out_urb_context *context = urb->context;
  	struct snd_usb_midi_out_endpoint* ep = context->ep;
-@@ -380,8 +390,13 @@
+@@ -380,8 +390,13 @@ static int send_bulk_static_data(struct
  		return -ENOMEM;
  	dump_urb("sending", buf, len);
  	if (ep->urbs[0].urb)
@@ -44,7 +44,7 @@
  	kfree(buf);
  	return err;
  }
-@@ -897,7 +912,12 @@
+@@ -1003,7 +1018,12 @@ static void update_roland_altsetting(str
  	int is_light_load;
  
  	intf = umidi->iface;
@@ -57,7 +57,7 @@
  	if (umidi->roland_load_ctl->private_value == is_light_load)
  		return;
  	hostif = &intf->altsetting[umidi->roland_load_ctl->private_value];
-@@ -984,7 +1004,11 @@
+@@ -1090,7 +1110,11 @@ static void snd_usbmidi_output_drain(str
  	struct usbmidi_out_port* port = substream->runtime->private_data;
  	struct snd_usb_midi_out_endpoint *ep = port->ep;
  	unsigned int drain_urbs;
@@ -68,8 +68,8 @@
 +#endif
  	long timeout = msecs_to_jiffies(50);
  
- 	/*
-@@ -995,6 +1019,7 @@
+ 	if (ep->umidi->disconnected)
+@@ -1103,6 +1127,7 @@ static void snd_usbmidi_output_drain(str
  	drain_urbs = ep->active_urbs;
  	if (drain_urbs) {
  		ep->drain_urbs |= drain_urbs;
@@ -77,7 +77,7 @@
  		do {
  			prepare_to_wait(&ep->drain_wait, &wait,
  					TASK_UNINTERRUPTIBLE);
-@@ -1004,6 +1029,18 @@
+@@ -1112,6 +1137,18 @@ static void snd_usbmidi_output_drain(str
  			drain_urbs &= ep->drain_urbs;
  		} while (drain_urbs && timeout);
  		finish_wait(&ep->drain_wait, &wait);
@@ -96,7 +96,7 @@
  	}
  	spin_unlock_irq(&ep->buffer_lock);
  }
-@@ -1700,7 +1737,11 @@
+@@ -1823,7 +1860,11 @@ static int snd_usbmidi_detect_endpoints(
  	intf = umidi->iface;
  	if (!intf || intf->num_altsetting < 1)
  		return -ENOENT;
@@ -108,7 +108,7 @@
  	intfd = get_iface_desc(hostif);
  
  	for (i = 0; i < intfd->bNumEndpoints; ++i) {
-@@ -2067,3 +2108,5 @@
+@@ -2197,3 +2238,5 @@ EXPORT_SYMBOL(snd_usbmidi_create);
  EXPORT_SYMBOL(snd_usbmidi_input_stop);
  EXPORT_SYMBOL(snd_usbmidi_input_start);
  EXPORT_SYMBOL(snd_usbmidi_disconnect);