mirror of https://gitee.com/openkylin/linux.git
Input: remove cdev from input_dev structure
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>
This commit is contained in:
parent
3eaeb9c951
commit
0c1efd3653
|
@ -1395,9 +1395,6 @@ int input_register_device(struct input_dev *dev)
|
||||||
snprintf(dev->dev.bus_id, sizeof(dev->dev.bus_id),
|
snprintf(dev->dev.bus_id, sizeof(dev->dev.bus_id),
|
||||||
"input%ld", (unsigned long) atomic_inc_return(&input_no) - 1);
|
"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);
|
error = device_add(&dev->dev);
|
||||||
if (error)
|
if (error)
|
||||||
return error;
|
return error;
|
||||||
|
|
|
@ -1018,7 +1018,6 @@ struct ff_effect {
|
||||||
* @going_away: marks devices that are in a middle of unregistering and
|
* @going_away: marks devices that are in a middle of unregistering and
|
||||||
* causes input_open_device*() fail with -ENODEV.
|
* causes input_open_device*() fail with -ENODEV.
|
||||||
* @dev: driver model's view of this device
|
* @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
|
* @h_list: list of input handles associated with the device. When
|
||||||
* accessing the list dev->mutex must be held
|
* accessing the list dev->mutex must be held
|
||||||
* @node: used to place the device onto input_dev_list
|
* @node: used to place the device onto input_dev_list
|
||||||
|
@ -1083,9 +1082,6 @@ struct input_dev {
|
||||||
int going_away;
|
int going_away;
|
||||||
|
|
||||||
struct device dev;
|
struct device dev;
|
||||||
union { /* temporarily so while we switching to struct device */
|
|
||||||
struct device *dev;
|
|
||||||
} cdev;
|
|
||||||
|
|
||||||
struct list_head h_list;
|
struct list_head h_list;
|
||||||
struct list_head node;
|
struct list_head node;
|
||||||
|
|
Loading…
Reference in New Issue