Merge commit 'v2.6.28-rc9' into next

diff --combined drivers/input/evdev.c
index c69a58fe54d8baaaab62147ebcd2f8ca7a364422,1070db330d3563010668c2608c00db1c85369a1f..ed8baa0aec3cce31023a2e97557db22ab5a7f7c6
--- 1/drivers/input/evdev.c
--- 2/drivers/input/evdev.c
+++ b/drivers/input/evdev.c
@@@ -19,7 -19,7 +19,7 @@@
  #include <linux/input.h>
  #include <linux/major.h>
  #include <linux/device.h>
 -#include <linux/compat.h>
 +#include "input-compat.h"
  
  struct evdev {
        int exist;
@@@ -235,7 -235,6 +235,6 @@@ static int evdev_release(struct inode *
                evdev_ungrab(evdev, client);
        mutex_unlock(&evdev->mutex);
  
-       evdev_fasync(-1, file, 0);
        evdev_detach_client(evdev, client);
        kfree(client);
  
@@@ -291,6 -290,187 +290,6 @@@ static int evdev_open(struct inode *ino
        return error;
  }
  
 -#ifdef CONFIG_COMPAT
 -
 -struct input_event_compat {
 -      struct compat_timeval time;
 -      __u16 type;
 -      __u16 code;
 -      __s32 value;
 -};
 -
 -struct ff_periodic_effect_compat {
 -      __u16 waveform;
 -      __u16 period;
 -      __s16 magnitude;
 -      __s16 offset;
 -      __u16 phase;
 -
 -      struct ff_envelope envelope;
 -
 -      __u32 custom_len;
 -      compat_uptr_t custom_data;
 -};
 -
 -struct ff_effect_compat {
 -      __u16 type;
 -      __s16 id;
 -      __u16 direction;
 -      struct ff_trigger trigger;
 -      struct ff_replay replay;
 -
 -      union {
 -              struct ff_constant_effect constant;
 -              struct ff_ramp_effect ramp;
 -              struct ff_periodic_effect_compat periodic;
 -              struct ff_condition_effect condition[2]; /* One for each axis */
 -              struct ff_rumble_effect rumble;
 -      } u;
 -};
 -
 -/* Note to the author of this code: did it ever occur to
 -   you why the ifdefs are needed? Think about it again. -AK */
 -#ifdef CONFIG_X86_64
 -#  define COMPAT_TEST is_compat_task()
 -#elif defined(CONFIG_IA64)
 -#  define COMPAT_TEST IS_IA32_PROCESS(task_pt_regs(current))
 -#elif defined(CONFIG_S390)
 -#  define COMPAT_TEST test_thread_flag(TIF_31BIT)
 -#elif defined(CONFIG_MIPS)
 -#  define COMPAT_TEST test_thread_flag(TIF_32BIT_ADDR)
 -#else
 -#  define COMPAT_TEST test_thread_flag(TIF_32BIT)
 -#endif
 -
 -static inline size_t evdev_event_size(void)
 -{
 -      return COMPAT_TEST ?
 -              sizeof(struct input_event_compat) : sizeof(struct input_event);
 -}
 -
 -static int evdev_event_from_user(const char __user *buffer,
 -                               struct input_event *event)
 -{
 -      if (COMPAT_TEST) {
 -              struct input_event_compat compat_event;
 -
 -              if (copy_from_user(&compat_event, buffer,
 -                                 sizeof(struct input_event_compat)))
 -                      return -EFAULT;
 -
 -              event->time.tv_sec = compat_event.time.tv_sec;
 -              event->time.tv_usec = compat_event.time.tv_usec;
 -              event->type = compat_event.type;
 -              event->code = compat_event.code;
 -              event->value = compat_event.value;
 -
 -      } else {
 -              if (copy_from_user(event, buffer, sizeof(struct input_event)))
 -                      return -EFAULT;
 -      }
 -
 -      return 0;
 -}
 -
 -static int evdev_event_to_user(char __user *buffer,
 -                              const struct input_event *event)
 -{
 -      if (COMPAT_TEST) {
 -              struct input_event_compat compat_event;
 -
 -              compat_event.time.tv_sec = event->time.tv_sec;
 -              compat_event.time.tv_usec = event->time.tv_usec;
 -              compat_event.type = event->type;
 -              compat_event.code = event->code;
 -              compat_event.value = event->value;
 -
 -              if (copy_to_user(buffer, &compat_event,
 -                               sizeof(struct input_event_compat)))
 -                      return -EFAULT;
 -
 -      } else {
 -              if (copy_to_user(buffer, event, sizeof(struct input_event)))
 -                      return -EFAULT;
 -      }
 -
 -      return 0;
 -}
 -
 -static int evdev_ff_effect_from_user(const char __user *buffer, size_t size,
 -                                   struct ff_effect *effect)
 -{
 -      if (COMPAT_TEST) {
 -              struct ff_effect_compat *compat_effect;
 -
 -              if (size != sizeof(struct ff_effect_compat))
 -                      return -EINVAL;
 -
 -              /*
 -               * It so happens that the pointer which needs to be changed
 -               * is the last field in the structure, so we can copy the
 -               * whole thing and replace just the pointer.
 -               */
 -
 -              compat_effect = (struct ff_effect_compat *)effect;
 -
 -              if (copy_from_user(compat_effect, buffer,
 -                                 sizeof(struct ff_effect_compat)))
 -                      return -EFAULT;
 -
 -              if (compat_effect->type == FF_PERIODIC &&
 -                  compat_effect->u.periodic.waveform == FF_CUSTOM)
 -                      effect->u.periodic.custom_data =
 -                              compat_ptr(compat_effect->u.periodic.custom_data);
 -      } else {
 -              if (size != sizeof(struct ff_effect))
 -                      return -EINVAL;
 -
 -              if (copy_from_user(effect, buffer, sizeof(struct ff_effect)))
 -                      return -EFAULT;
 -      }
 -
 -      return 0;
 -}
 -
 -#else
 -
 -static inline size_t evdev_event_size(void)
 -{
 -      return sizeof(struct input_event);
 -}
 -
 -static int evdev_event_from_user(const char __user *buffer,
 -                               struct input_event *event)
 -{
 -      if (copy_from_user(event, buffer, sizeof(struct input_event)))
 -              return -EFAULT;
 -
 -      return 0;
 -}
 -
 -static int evdev_event_to_user(char __user *buffer,
 -                              const struct input_event *event)
 -{
 -      if (copy_to_user(buffer, event, sizeof(struct input_event)))
 -              return -EFAULT;
 -
 -      return 0;
 -}
 -
 -static int evdev_ff_effect_from_user(const char __user *buffer, size_t size,
 -                                   struct ff_effect *effect)
 -{
 -      if (size != sizeof(struct ff_effect))
 -              return -EINVAL;
 -
 -      if (copy_from_user(effect, buffer, sizeof(struct ff_effect)))
 -              return -EFAULT;
 -
 -      return 0;
 -}
 -
 -#endif /* CONFIG_COMPAT */
 -
  static ssize_t evdev_write(struct file *file, const char __user *buffer,
                           size_t count, loff_t *ppos)
  {
@@@ -310,14 -490,14 +309,14 @@@
  
        while (retval < count) {
  
 -              if (evdev_event_from_user(buffer + retval, &event)) {
 +              if (input_event_from_user(buffer + retval, &event)) {
                        retval = -EFAULT;
                        goto out;
                }
  
                input_inject_event(&evdev->handle,
                                   event.type, event.code, event.value);
 -              retval += evdev_event_size();
 +              retval += input_event_size();
        }
  
   out:
@@@ -351,7 -531,7 +350,7 @@@ static ssize_t evdev_read(struct file *
        struct input_event event;
        int retval;
  
 -      if (count < evdev_event_size())
 +      if (count < input_event_size())
                return -EINVAL;
  
        if (client->head == client->tail && evdev->exist &&
@@@ -366,13 -546,13 +365,13 @@@
        if (!evdev->exist)
                return -ENODEV;
  
 -      while (retval + evdev_event_size() <= count &&
 +      while (retval + input_event_size() <= count &&
               evdev_fetch_next_event(client, &event)) {
  
 -              if (evdev_event_to_user(buffer + retval, &event))
 +              if (input_event_to_user(buffer + retval, &event))
                        return -EFAULT;
  
 -              retval += evdev_event_size();
 +              retval += input_event_size();
        }
  
        return retval;
@@@ -643,7 -823,7 +642,7 @@@ static long evdev_do_ioctl(struct file 
  
                        if (_IOC_NR(cmd) == _IOC_NR(EVIOCSFF)) {
  
 -                              if (evdev_ff_effect_from_user(p, _IOC_SIZE(cmd), &effect))
 +                              if (input_ff_effect_from_user(p, _IOC_SIZE(cmd), &effect))
                                        return -EFAULT;
  
                                error = input_ff_upload(dev, &effect, file);
@@@ -820,7 -1000,7 +819,7 @@@ static int evdev_connect(struct input_h
        evdev->handle.handler = handler;
        evdev->handle.private = evdev;
  
 -      strlcpy(evdev->dev.bus_id, evdev->name, sizeof(evdev->dev.bus_id));
 +      dev_set_name(&evdev->dev, evdev->name);
        evdev->dev.devt = MKDEV(INPUT_MAJOR, EVDEV_MINOR_BASE + minor);
        evdev->dev.class = &input_class;
        evdev->dev.parent = &dev->dev;

diff --combined drivers/input/joydev.c
index f9b876bd378d53865bb21e67bc1b763e3fa61743,a85b1485e77499cd6afb15f46590b82951e1aa9e..6f2366220a50bd9c415f0b6986ded77bd309ffe0
--- 1/drivers/input/joydev.c
--- 2/drivers/input/joydev.c
+++ b/drivers/input/joydev.c
@@@ -244,7 -244,6 +244,6 @@@ static int joydev_release(struct inode 
        struct joydev_client *client = file->private_data;
        struct joydev *joydev = client->joydev;
  
-       joydev_fasync(-1, file, 0);
        joydev_detach_client(joydev, client);
        kfree(client);
  
@@@ -801,7 -800,7 +800,7 @@@ static int joydev_connect(struct input_
                }
        }
  
 -      strlcpy(joydev->dev.bus_id, joydev->name, sizeof(joydev->dev.bus_id));
 +      dev_set_name(&joydev->dev, joydev->name);
        joydev->dev.devt = MKDEV(INPUT_MAJOR, JOYDEV_MINOR_BASE + minor);
        joydev->dev.class = &input_class;
        joydev->dev.parent = &dev->dev;

diff --combined drivers/input/mousedev.c
index 4ab8b28bace870a653a5e913c633fdd1a6001a90,d8c056fe7e982c2ee1f1dc39298e0e4721a06921..ef99a7e6d40cb8741a18a796048ea78a32d2cc3b
--- 1/drivers/input/mousedev.c
--- 2/drivers/input/mousedev.c
+++ b/drivers/input/mousedev.c
@@@ -519,7 -519,6 +519,6 @@@ static int mousedev_release(struct inod
        struct mousedev_client *client = file->private_data;
        struct mousedev *mousedev = client->mousedev;
  
-       mousedev_fasync(-1, file, 0);
        mousedev_detach_client(mousedev, client);
        kfree(client);
  
@@@ -879,7 -878,8 +878,7 @@@ static struct mousedev *mousedev_create
        mousedev->handle.handler = handler;
        mousedev->handle.private = mousedev;
  
 -      strlcpy(mousedev->dev.bus_id, mousedev->name,
 -              sizeof(mousedev->dev.bus_id));
 +      dev_set_name(&mousedev->dev, mousedev->name);
        mousedev->dev.class = &input_class;
        if (dev)
                mousedev->dev.parent = &dev->dev;