target/linux/s3c24xx/patches-2.6.26/1133-tracking-2.6.26-rc1-remove-input-dev-private-member.patch

   1 From 6ba11137f14825eb43984cda9773b9333de7c1e6 Mon Sep 17 00:00:00 2001
   2 From: Andy Green <andy@openmoko.com>
   3 Date: Fri, 25 Jul 2008 23:06:07 +0100
   4 Subject: [PATCH] tracking-2.6.26-rc1-remove-input-dev-private-member.patch
   5  Signed-off-by: Andy Green <andy@openmoko.com>
   6
   7 ---
   8  drivers/input/keyboard/neo1973kbd.c    |    1 -
   9  drivers/input/keyboard/qt2410kbd.c     |    1 -
  10  drivers/input/misc/lis302dl.c          |    6 +++---
  11  drivers/input/touchscreen/s3c2410_ts.c |    1 -
  12  4 files changed, 3 insertions(+), 6 deletions(-)
  13
  14 diff --git a/drivers/input/keyboard/neo1973kbd.c b/drivers/input/keyboard/neo1973kbd.c
  15 index 6fc3ac1..d22f377 100644
  16 --- a/drivers/input/keyboard/neo1973kbd.c
  17 +++ b/drivers/input/keyboard/neo1973kbd.c
  18 @@ -199,7 +199,6 @@ static int neo1973kbd_probe(struct platform_device *pdev)
  19         input_dev->id.vendor = 0x0001;
  20         input_dev->id.product = 0x0001;
  21         input_dev->id.version = 0x0100;
  22 -       input_dev->private = neo1973kbd;
  23
  24         input_dev->evbit[0] = BIT(EV_KEY) | BIT(EV_SW);
  25         set_bit(SW_HEADPHONE_INSERT, input_dev->swbit);
  26 diff --git a/drivers/input/keyboard/qt2410kbd.c b/drivers/input/keyboard/qt2410kbd.c
  27 index cd8d7c6..95392cc 100644
  28 --- a/drivers/input/keyboard/qt2410kbd.c
  29 +++ b/drivers/input/keyboard/qt2410kbd.c
  30 @@ -124,7 +124,6 @@ static int gta01kbd_probe(struct platform_device *pdev)
  31         input_dev->id.vendor = 0x0001;
  32         input_dev->id.product = 0x0001;
  33         input_dev->id.version = 0x0100;
  34 -       input_dev->private = gta01kbd;
  35
  36         input_dev->evbit[0] = BIT(EV_KEY);
  37  #if 0
  38 diff --git a/drivers/input/misc/lis302dl.c b/drivers/input/misc/lis302dl.c
  39 index 6067dba..1d19418 100644
  40 --- a/drivers/input/misc/lis302dl.c
  41 +++ b/drivers/input/misc/lis302dl.c
  42 @@ -236,7 +236,7 @@ static struct attribute_group lis302dl_attr_group = {
  43
  44  static int lis302dl_input_open(struct input_dev *inp)
  45  {
  46 -       struct lis302dl_info *lis = inp->private;
  47 +       struct lis302dl_info *lis = input_get_drvdata(inp);
  48         u_int8_t ctrl1 = LIS302DL_CTRL1_PD | LIS302DL_CTRL1_Xen |
  49                          LIS302DL_CTRL1_Yen | LIS302DL_CTRL1_Zen;
  50         unsigned long flags;
  51 @@ -255,7 +255,7 @@ static int lis302dl_input_open(struct input_dev *inp)
  52
  53  static void lis302dl_input_close(struct input_dev *inp)
  54  {
  55 -       struct lis302dl_info *lis = inp->private;
  56 +       struct lis302dl_info *lis = input_get_drvdata(inp);
  57         u_int8_t ctrl1 = LIS302DL_CTRL1_Xen | LIS302DL_CTRL1_Yen |
  58                          LIS302DL_CTRL1_Zen;
  59         unsigned long flags;
  60 @@ -334,7 +334,7 @@ static int __devinit lis302dl_probe(struct spi_device *spi)
  61         set_bit(BTN_Y, lis->input_dev->keybit);
  62         set_bit(BTN_Z, lis->input_dev->keybit);
  63  */
  64 -       lis->input_dev->private = lis;
  65 +       input_set_drvdata(lis->input_dev, lis);
  66         lis->input_dev->name = pdata->name;
  67          /* SPI Bus not defined as a valid bus for input subsystem*/
  68         lis->input_dev->id.bustype = BUS_I2C; /* lie about it */
  69 diff --git a/drivers/input/touchscreen/s3c2410_ts.c b/drivers/input/touchscreen/s3c2410_ts.c
  70 index 68071c2..bc6ccc2 100644
  71 --- a/drivers/input/touchscreen/s3c2410_ts.c
  72 +++ b/drivers/input/touchscreen/s3c2410_ts.c
  73 @@ -277,7 +277,6 @@ static int __init s3c2410ts_probe(struct platform_device *pdev)
  74         input_set_abs_params(ts.dev, ABS_Y, 0, 0x3FF, 0, 0);
  75         input_set_abs_params(ts.dev, ABS_PRESSURE, 0, 1, 0, 0);
  76
  77 -       ts.dev->private = &ts;
  78         ts.dev->name = s3c2410ts_name;
  79         ts.dev->id.bustype = BUS_RS232;
  80         ts.dev->id.vendor = 0xDEAD;
  81 --
  82 1.5.6.3
  83