Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0c1efd36 authored by Dmitry Torokhov's avatar Dmitry Torokhov
Browse files

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: default avatarDmitry Torokhov <dtor@mail.ru>
parent 3eaeb9c9

drivers/input/input.c

+0 −3
Original line number Diff line number Diff line
@@ -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;

include/linux/input.h

+0 −4
Original line number Diff line number Diff line
@@ -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
@@ -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;