2 files changed, 0 insertions, 7 deletions

diff --git a/drivers/input/input.c b/drivers/input/input.c
index e1729e1dd9b2..6ee8af8963f9 100644
--- a/drivers/input/input.c
+++ b/drivers/input/input.c
@@ -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;
diff --git a/include/linux/input.h b/include/linux/input.h
index 9a963fe97300..48937ffa977a 100644
--- a/include/linux/input.h
+++ b/include/linux/input.h
@@ -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;