Skip to content

Commit

Permalink
Input: remove cdev from input_dev structure
Browse files Browse the repository at this point in the history
Cdev field was obsolete and provided only for backward compatibility
since conversion of input core from class devices to regular devices.
It is time to remove it.

Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
  • Loading branch information
Dmitry Torokhov committed Jan 21, 2008
1 parent 3eaeb9c commit 0c1efd3
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 7 deletions.
3 changes: 0 additions & 3 deletions drivers/input/input.c
Original file line number Diff line number Diff line change
Expand Up @@ -1395,9 +1395,6 @@ int input_register_device(struct input_dev *dev)
snprintf(dev->dev.bus_id, sizeof(dev->dev.bus_id),
"input%ld", (unsigned long) atomic_inc_return(&input_no) - 1);

if (dev->cdev.dev)
dev->dev.parent = dev->cdev.dev;

error = device_add(&dev->dev);
if (error)
return error;
Expand Down
4 changes: 0 additions & 4 deletions include/linux/input.h
Original file line number Diff line number Diff line change
Expand Up @@ -1018,7 +1018,6 @@ struct ff_effect {
* @going_away: marks devices that are in a middle of unregistering and
* causes input_open_device*() fail with -ENODEV.
* @dev: driver model's view of this device
* @cdev: union for struct device pointer
* @h_list: list of input handles associated with the device. When
* accessing the list dev->mutex must be held
* @node: used to place the device onto input_dev_list
Expand Down Expand Up @@ -1083,9 +1082,6 @@ struct input_dev {
int going_away;

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

struct list_head h_list;
struct list_head node;
Expand Down

0 comments on commit 0c1efd3

Please sign in to comment.