Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=469ba4dff954389f58cebb3df645e24433dcd565
Commit:     469ba4dff954389f58cebb3df645e24433dcd565
Parent:     88a447a030bfec9f1e8666daf27d9d73c8c92448
Author:     Dmitry Torokhov <[EMAIL PROTECTED]>
AuthorDate: Thu Apr 12 01:34:58 2007 -0400
Committer:  Dmitry Torokhov <[EMAIL PROTECTED]>
CommitDate: Thu Apr 12 01:34:58 2007 -0400

    Input: keyboards - switch to using input_dev->dev.parent
    
    In preparation for struct class_device -> struct device input
    core conversion, switch to using input_dev->dev.parent when
    specifying device position in sysfs tree.
    
    Signed-off-by: Dmitry Torokhov <[EMAIL PROTECTED]>
---
 drivers/input/keyboard/aaed2000_kbd.c    |    3 ++-
 drivers/input/keyboard/atkbd.c           |    2 +-
 drivers/input/keyboard/corgikbd.c        |    2 +-
 drivers/input/keyboard/gpio_keys.c       |    2 +-
 drivers/input/keyboard/hil_kbd.c         |    2 +-
 drivers/input/keyboard/lkkbd.c           |    2 +-
 drivers/input/keyboard/locomokbd.c       |    1 +
 drivers/input/keyboard/newtonkbd.c       |    2 +-
 drivers/input/keyboard/omap-keypad.c     |    2 +-
 drivers/input/keyboard/pxa27x_keyboard.c |    2 +-
 drivers/input/keyboard/spitzkbd.c        |    2 +-
 drivers/input/keyboard/stowaway.c        |    2 +-
 drivers/input/keyboard/sunkbd.c          |    2 +-
 drivers/input/keyboard/xtkbd.c           |    2 +-
 14 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/drivers/input/keyboard/aaed2000_kbd.c 
b/drivers/input/keyboard/aaed2000_kbd.c
index e584413..3a37505 100644
--- a/drivers/input/keyboard/aaed2000_kbd.c
+++ b/drivers/input/keyboard/aaed2000_kbd.c
@@ -141,7 +141,8 @@ static int __devinit aaedkbd_probe(struct platform_device 
*pdev)
        input_dev->id.vendor = 0x0001;
        input_dev->id.product = 0x0001;
        input_dev->id.version = 0x0100;
-       input_dev->cdev.dev = &pdev->dev;
+       input_dev->dev.parent = &pdev->dev;
+
        input_set_drvdata(input_dev, aaedkbd);
 
        input_dev->evbit[0] = BIT(EV_KEY) | BIT(EV_REP);
diff --git a/drivers/input/keyboard/atkbd.c b/drivers/input/keyboard/atkbd.c
index 0475473..be1fe46 100644
--- a/drivers/input/keyboard/atkbd.c
+++ b/drivers/input/keyboard/atkbd.c
@@ -883,7 +883,7 @@ static void atkbd_set_device_attrs(struct atkbd *atkbd)
        input_dev->id.product = atkbd->translated ? 1 : atkbd->set;
        input_dev->id.version = atkbd->id;
        input_dev->event = atkbd_event;
-       input_dev->cdev.dev = &atkbd->ps2dev.serio->dev;
+       input_dev->dev.parent = &atkbd->ps2dev.serio->dev;
 
        input_set_drvdata(input_dev, atkbd);
 
diff --git a/drivers/input/keyboard/corgikbd.c 
b/drivers/input/keyboard/corgikbd.c
index 25dd879..6578bff 100644
--- a/drivers/input/keyboard/corgikbd.c
+++ b/drivers/input/keyboard/corgikbd.c
@@ -323,7 +323,7 @@ static int __init corgikbd_probe(struct platform_device 
*pdev)
        input_dev->id.vendor = 0x0001;
        input_dev->id.product = 0x0001;
        input_dev->id.version = 0x0100;
-       input_dev->cdev.dev = &pdev->dev;
+       input_dev->dev.parent = &pdev->dev;
 
        input_dev->evbit[0] = BIT(EV_KEY) | BIT(EV_REP) | BIT(EV_PWR) | 
BIT(EV_SW);
        input_dev->keycode = corgikbd->keycode;
diff --git a/drivers/input/keyboard/gpio_keys.c 
b/drivers/input/keyboard/gpio_keys.c
index b943993..71771ba 100644
--- a/drivers/input/keyboard/gpio_keys.c
+++ b/drivers/input/keyboard/gpio_keys.c
@@ -65,7 +65,7 @@ static int __devinit gpio_keys_probe(struct platform_device 
*pdev)
 
        input->name = pdev->name;
        input->phys = "gpio-keys/input0";
-       input->cdev.dev = &pdev->dev;
+       input->dev.parent = &pdev->dev;
 
        input->id.bustype = BUS_HOST;
        input->id.vendor = 0x0001;
diff --git a/drivers/input/keyboard/hil_kbd.c b/drivers/input/keyboard/hil_kbd.c
index 087d4df..cdd254f 100644
--- a/drivers/input/keyboard/hil_kbd.c
+++ b/drivers/input/keyboard/hil_kbd.c
@@ -335,7 +335,7 @@ static int hil_kbd_connect(struct serio *serio, struct 
serio_driver *drv)
        kbd->dev->id.vendor     = PCI_VENDOR_ID_HP;
        kbd->dev->id.product    = 0x0001; /* TODO: get from kbd->rsc */
        kbd->dev->id.version    = 0x0100; /* TODO: get from kbd->rsc */
-       kbd->dev->cdev.dev      = &serio->dev;
+       kbd->dev->dev.parent    = &serio->dev;
 
        for (i = 0; i < 128; i++) {
                set_bit(hil_kbd_set1[i], kbd->dev->keybit);
diff --git a/drivers/input/keyboard/lkkbd.c b/drivers/input/keyboard/lkkbd.c
index 257b9d4..1b08f4e 100644
--- a/drivers/input/keyboard/lkkbd.c
+++ b/drivers/input/keyboard/lkkbd.c
@@ -666,7 +666,7 @@ lkkbd_connect (struct serio *serio, struct serio_driver 
*drv)
        input_dev->id.vendor = SERIO_LKKBD;
        input_dev->id.product = 0;
        input_dev->id.version = 0x0100;
-       input_dev->cdev.dev = &serio->dev;
+       input_dev->dev.parent = &serio->dev;
        input_dev->event = lkkbd_event;
 
        input_set_drvdata (input_dev, lk);
diff --git a/drivers/input/keyboard/locomokbd.c 
b/drivers/input/keyboard/locomokbd.c
index 764f5ee..7a41b27 100644
--- a/drivers/input/keyboard/locomokbd.c
+++ b/drivers/input/keyboard/locomokbd.c
@@ -231,6 +231,7 @@ static int locomokbd_probe(struct locomo_dev *dev)
        input_dev->id.vendor = 0x0001;
        input_dev->id.product = 0x0001;
        input_dev->id.version = 0x0100;
+       input_dev->dev.parent = &dev->dev;
 
        input_dev->evbit[0] = BIT(EV_KEY) | BIT(EV_REP);
        input_dev->keycode = locomokbd->keycode;
diff --git a/drivers/input/keyboard/newtonkbd.c 
b/drivers/input/keyboard/newtonkbd.c
index 179f3a4..b97a41e 100644
--- a/drivers/input/keyboard/newtonkbd.c
+++ b/drivers/input/keyboard/newtonkbd.c
@@ -104,7 +104,7 @@ static int nkbd_connect(struct serio *serio, struct 
serio_driver *drv)
        input_dev->id.vendor = SERIO_NEWTON;
        input_dev->id.product = 0x0001;
        input_dev->id.version = 0x0100;
-       input_dev->cdev.dev = &serio->dev;
+       input_dev->dev.parent = &serio->dev;
 
        input_dev->evbit[0] = BIT(EV_KEY) | BIT(EV_REP);
        input_dev->keycode = nkbd->keycode;
diff --git a/drivers/input/keyboard/omap-keypad.c 
b/drivers/input/keyboard/omap-keypad.c
index 1790f0c..3a22863 100644
--- a/drivers/input/keyboard/omap-keypad.c
+++ b/drivers/input/keyboard/omap-keypad.c
@@ -370,7 +370,7 @@ static int __init omap_kp_probe(struct platform_device 
*pdev)
                set_bit(keymap[i] & KEY_MAX, input_dev->keybit);
        input_dev->name = "omap-keypad";
        input_dev->phys = "omap-keypad/input0";
-       input_dev->cdev.dev = &pdev->dev;
+       input_dev->dev.parent = &pdev->dev;
 
        input_dev->id.bustype = BUS_HOST;
        input_dev->id.vendor = 0x0001;
diff --git a/drivers/input/keyboard/pxa27x_keyboard.c 
b/drivers/input/keyboard/pxa27x_keyboard.c
index 1a2afbf..993df87 100644
--- a/drivers/input/keyboard/pxa27x_keyboard.c
+++ b/drivers/input/keyboard/pxa27x_keyboard.c
@@ -169,7 +169,7 @@ static int __devinit pxakbd_probe(struct platform_device 
*pdev)
        input_dev->id.bustype = BUS_HOST;
        input_dev->open = pxakbd_open;
        input_dev->close = pxakbd_close;
-       input_dev->cdev.dev = &pdev->dev;
+       input_dev->dev.parent = &pdev->dev;
 
        input_dev->evbit[0] = BIT(EV_KEY) | BIT(EV_REP) | BIT(EV_REL);
        input_dev->relbit[LONG(REL_WHEEL)] = BIT(REL_WHEEL);
diff --git a/drivers/input/keyboard/spitzkbd.c 
b/drivers/input/keyboard/spitzkbd.c
index bc96074..41b8038 100644
--- a/drivers/input/keyboard/spitzkbd.c
+++ b/drivers/input/keyboard/spitzkbd.c
@@ -374,7 +374,7 @@ static int __init spitzkbd_probe(struct platform_device 
*dev)
 
        input_dev->name = "Spitz Keyboard";
        input_dev->phys = spitzkbd->phys;
-       input_dev->cdev.dev = &dev->dev;
+       input_dev->dev.parent = &dev->dev;
 
        input_dev->id.bustype = BUS_HOST;
        input_dev->id.vendor = 0x0001;
diff --git a/drivers/input/keyboard/stowaway.c 
b/drivers/input/keyboard/stowaway.c
index c109620..b44b068 100644
--- a/drivers/input/keyboard/stowaway.c
+++ b/drivers/input/keyboard/stowaway.c
@@ -108,7 +108,7 @@ static int skbd_connect(struct serio *serio, struct 
serio_driver *drv)
        input_dev->id.vendor = SERIO_STOWAWAY;
        input_dev->id.product = 0x0001;
        input_dev->id.version = 0x0100;
-       input_dev->cdev.dev = &serio->dev;
+       input_dev->dev.parent = &serio->dev;
 
        input_dev->evbit[0] = BIT(EV_KEY) | BIT(EV_REP);
        input_dev->keycode = skbd->keycode;
diff --git a/drivers/input/keyboard/sunkbd.c b/drivers/input/keyboard/sunkbd.c
index ca74b2b..1d4e396 100644
--- a/drivers/input/keyboard/sunkbd.c
+++ b/drivers/input/keyboard/sunkbd.c
@@ -271,7 +271,7 @@ static int sunkbd_connect(struct serio *serio, struct 
serio_driver *drv)
        input_dev->id.vendor  = SERIO_SUNKBD;
        input_dev->id.product = sunkbd->type;
        input_dev->id.version = 0x0100;
-       input_dev->cdev.dev = &serio->dev;
+       input_dev->dev.parent = &serio->dev;
 
        input_set_drvdata(input_dev, sunkbd);
 
diff --git a/drivers/input/keyboard/xtkbd.c b/drivers/input/keyboard/xtkbd.c
index 11d9708..f3a56eb 100644
--- a/drivers/input/keyboard/xtkbd.c
+++ b/drivers/input/keyboard/xtkbd.c
@@ -108,7 +108,7 @@ static int xtkbd_connect(struct serio *serio, struct 
serio_driver *drv)
        input_dev->id.vendor  = 0x0001;
        input_dev->id.product = 0x0001;
        input_dev->id.version = 0x0100;
-       input_dev->cdev.dev = &serio->dev;
+       input_dev->dev.parent = &serio->dev;
 
        input_dev->evbit[0] = BIT(EV_KEY) | BIT(EV_REP);
        input_dev->keycode = xtkbd->keycode;
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to