target/linux/s3c24xx/patches-2.6.26/0122-tracking-2.6.25-input_dev-cdev-union-removed.patch.patch

   1 From 903c853b0a4b1d56d61d5661171102f5f369c27d Mon Sep 17 00:00:00 2001
   2 From: Andy Green <andy@openmoko.com>
   3 Date: Fri, 25 Jul 2008 23:06:06 +0100
   4 Subject: [PATCH] tracking-2.6.25-input_dev-cdev-union-removed.patch
   5
   6 struct input_dev in include/linux/input.h used to have a union
   7 cdev which contained the associated device struct pointer.  This
   8 got simplified out in 2.6.25, so this patch removes cdev from
   9 our drivers that used it before.
  10
  11 Signed-off-by: Andy Green <andy@openmoko.com>
  12 ---
  13  drivers/i2c/chips/pcf50606.c        |    1 -
  14  drivers/i2c/chips/pcf50633.c        |    1 -
  15  drivers/input/keyboard/neo1973kbd.c |    1 -
  16  drivers/input/keyboard/qt2410kbd.c  |    1 -
  17  4 files changed, 0 insertions(+), 4 deletions(-)
  18
  19 diff --git a/drivers/i2c/chips/pcf50606.c b/drivers/i2c/chips/pcf50606.c
  20 index aa841e3..2466bf8 100644
  21 --- a/drivers/i2c/chips/pcf50606.c
  22 +++ b/drivers/i2c/chips/pcf50606.c
  23 @@ -1708,7 +1708,6 @@ static int pcf50606_detect(struct i2c_adapter *adapter, int address, int kind)
  24         data->input_dev->name = "FIC Neo1973 PMU events";
  25         data->input_dev->phys = "I2C";
  26         data->input_dev->id.bustype = BUS_I2C;
  27 -       data->input_dev->cdev.dev = &new_client->dev;
  28
  29         data->input_dev->evbit[0] = BIT(EV_KEY) | BIT(EV_PWR);
  30         set_bit(KEY_POWER, data->input_dev->keybit);
  31 diff --git a/drivers/i2c/chips/pcf50633.c b/drivers/i2c/chips/pcf50633.c
  32 index 09d5cfd..cb4cad8 100644
  33 --- a/drivers/i2c/chips/pcf50633.c
  34 +++ b/drivers/i2c/chips/pcf50633.c
  35 @@ -1732,7 +1732,6 @@ static int pcf50633_detect(struct i2c_adapter *adapter, int address, int kind)
  36         data->input_dev->name = "GTA02 PMU events";
  37         data->input_dev->phys = "FIXME";
  38         data->input_dev->id.bustype = BUS_I2C;
  39 -       data->input_dev->cdev.dev = &new_client->dev;
  40
  41         data->input_dev->evbit[0] = BIT(EV_KEY) | BIT(EV_PWR);
  42         set_bit(KEY_POWER, data->input_dev->keybit);
  43 diff --git a/drivers/input/keyboard/neo1973kbd.c b/drivers/input/keyboard/neo1973kbd.c
  44 index 8b9a420..6fc3ac1 100644
  45 --- a/drivers/input/keyboard/neo1973kbd.c
  46 +++ b/drivers/input/keyboard/neo1973kbd.c
  47 @@ -199,7 +199,6 @@ static int neo1973kbd_probe(struct platform_device *pdev)
  48         input_dev->id.vendor = 0x0001;
  49         input_dev->id.product = 0x0001;
  50         input_dev->id.version = 0x0100;
  51 -       input_dev->cdev.dev = &pdev->dev;
  52         input_dev->private = neo1973kbd;
  53
  54         input_dev->evbit[0] = BIT(EV_KEY) | BIT(EV_SW);
  55 diff --git a/drivers/input/keyboard/qt2410kbd.c b/drivers/input/keyboard/qt2410kbd.c
  56 index fa4bf32..cd8d7c6 100644
  57 --- a/drivers/input/keyboard/qt2410kbd.c
  58 +++ b/drivers/input/keyboard/qt2410kbd.c
  59 @@ -124,7 +124,6 @@ static int gta01kbd_probe(struct platform_device *pdev)
  60         input_dev->id.vendor = 0x0001;
  61         input_dev->id.product = 0x0001;
  62         input_dev->id.version = 0x0100;
  63 -       input_dev->cdev.dev = &pdev->dev;
  64         input_dev->private = gta01kbd;
  65
  66         input_dev->evbit[0] = BIT(EV_KEY);
  67 --
  68 1.5.6.3
  69