Skip to content

Commit

Permalink
Input: prepare to switching to struct device
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Dmitry Torokhov committed Apr 12, 2007
1 parent 7791bda commit 88a447a
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 0 deletions.
3 changes: 3 additions & 0 deletions drivers/input/input.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
3 changes: 3 additions & 0 deletions include/linux/input.h
Original file line number Diff line number Diff line change
Expand Up @@ -972,6 +972,9 @@ struct input_dev {
unsigned int users;

struct class_device cdev;
union { /* temporarily so while we switching to struct device */
struct device *parent;
} dev;

struct list_head h_list;
struct list_head node;
Expand Down

0 comments on commit 88a447a

Please sign in to comment.