From 96ce753f899bc393be74bcb2f1f54ce3b6a8f669 Mon Sep 17 00:00:00 2001 From: Dmitry Torokhov Date: Mon, 21 Jan 2008 01:08:24 -0500 Subject: [PATCH] --- yaml --- r: 84347 b: refs/heads/master c: 0c1efd365306c9b04df5abdd41e9b4dc721e84fb h: refs/heads/master i: 84345: 0a1cf254980c8e194ca6a2598daf623c8accf361 84343: b98ddd3b53d702f01072c1ac30bd2197b580f380 v: v3 --- [refs] | 2 +- trunk/drivers/input/input.c | 3 --- trunk/include/linux/input.h | 4 ---- 3 files changed, 1 insertion(+), 8 deletions(-) diff --git a/[refs] b/[refs] index ce2da87e7a75..0ca085b341df 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3eaeb9c951d060fff71bcdc327eb48ee52ed1c0c +refs/heads/master: 0c1efd365306c9b04df5abdd41e9b4dc721e84fb diff --git a/trunk/drivers/input/input.c b/trunk/drivers/input/input.c index e1729e1dd9b2..6ee8af8963f9 100644 --- a/trunk/drivers/input/input.c +++ b/trunk/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/trunk/include/linux/input.h b/trunk/include/linux/input.h index 9a963fe97300..48937ffa977a 100644 --- a/trunk/include/linux/input.h +++ b/trunk/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;