summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorDmitry Torokhov <dtor@insightbb.com>2007-04-12 07:34:47 +0200
committerDmitry Torokhov <dtor@insightbb.com>2007-04-12 07:34:47 +0200
commit88a447a030bfec9f1e8666daf27d9d73c8c92448 (patch)
tree950840ba1271c2129d48692f4deab2fa661bd0a5 /drivers
parentInput: drivers/usb/input - don't access dev->private directly (diff)
downloadlinux-88a447a030bfec9f1e8666daf27d9d73c8c92448.tar.xz
linux-88a447a030bfec9f1e8666daf27d9d73c8c92448.zip
Input: prepare to switching to struct device
In preparation to switching to struct device and class device going away provide an alias to allow drivers that create devices to use either input_dev->cdev.dev or input_dev->dev.parent to put them into sysfs tree. The former will go away once conversion to struct device is complete. Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/input/input.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/input/input.c b/drivers/input/input.c
index 86b27079004a..173c2861ec58 100644
--- a/drivers/input/input.c
+++ b/drivers/input/input.c
@@ -1079,6 +1079,9 @@ int input_register_device(struct input_dev *dev)
snprintf(dev->cdev.class_id, sizeof(dev->cdev.class_id),
"input%ld", (unsigned long) atomic_inc_return(&input_no) - 1);
+ if (!dev->cdev.dev)
+ dev->cdev.dev = dev->dev.parent;
+
error = class_device_add(&dev->cdev);
if (error)
return error;