diff options
author | Dmitry Torokhov <dtor at mail.ru> | 2007-07-16 08:28:15 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-07-18 13:23:46 -0400 |
commit | 2c8a3a33558d3f5aa18b56eada66fbe712ee6bb7 (patch) | |
tree | b65a1b88c270a7d1ff6b6da16964c2278c3fe81a /drivers/media/dvb/ttpci | |
parent | afb758c4b03b17ff856f2bd58e488d152b342875 (diff) |
V4L/DVB (5698): Input: drivers/media - switch to using input_dev->dev.parent
In preparation for struct class_device -> struct device input
core conversion switch to using input_dev->dev.parent when
specifying device position in sysfs tree.
Signed-off-by: Dmitry Torokhov <dtor at mail.ru>
Acked-by: Thierry Merle <thierry.merle@free.fr>
Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media/dvb/ttpci')
-rw-r--r-- | drivers/media/dvb/ttpci/av7110_ir.c | 2 | ||||
-rw-r--r-- | drivers/media/dvb/ttpci/budget-ci.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/dvb/ttpci/av7110_ir.c b/drivers/media/dvb/ttpci/av7110_ir.c index a97f166bb523..6322800ee12b 100644 --- a/drivers/media/dvb/ttpci/av7110_ir.c +++ b/drivers/media/dvb/ttpci/av7110_ir.c | |||
@@ -356,7 +356,7 @@ int __devinit av7110_ir_init(struct av7110 *av7110) | |||
356 | input_dev->id.vendor = av7110->dev->pci->vendor; | 356 | input_dev->id.vendor = av7110->dev->pci->vendor; |
357 | input_dev->id.product = av7110->dev->pci->device; | 357 | input_dev->id.product = av7110->dev->pci->device; |
358 | } | 358 | } |
359 | input_dev->cdev.dev = &av7110->dev->pci->dev; | 359 | input_dev->dev.parent = &av7110->dev->pci->dev; |
360 | /* initial keymap */ | 360 | /* initial keymap */ |
361 | memcpy(av7110->ir.key_map, default_key_map, sizeof av7110->ir.key_map); | 361 | memcpy(av7110->ir.key_map, default_key_map, sizeof av7110->ir.key_map); |
362 | input_register_keys(&av7110->ir); | 362 | input_register_keys(&av7110->ir); |
diff --git a/drivers/media/dvb/ttpci/budget-ci.c b/drivers/media/dvb/ttpci/budget-ci.c index 9d42f88ebb0e..873c3ba296f2 100644 --- a/drivers/media/dvb/ttpci/budget-ci.c +++ b/drivers/media/dvb/ttpci/budget-ci.c | |||
@@ -206,7 +206,7 @@ static int msp430_ir_init(struct budget_ci *budget_ci) | |||
206 | input_dev->id.vendor = saa->pci->vendor; | 206 | input_dev->id.vendor = saa->pci->vendor; |
207 | input_dev->id.product = saa->pci->device; | 207 | input_dev->id.product = saa->pci->device; |
208 | } | 208 | } |
209 | input_dev->cdev.dev = &saa->pci->dev; | 209 | input_dev->dev.parent = &saa->pci->dev; |
210 | 210 | ||
211 | /* Select keymap and address */ | 211 | /* Select keymap and address */ |
212 | switch (budget_ci->budget.dev->pci->subsystem_device) { | 212 | switch (budget_ci->budget.dev->pci->subsystem_device) { |