From 8c093da2f9ca5301d886dda4ec36726f09d9e23b Mon Sep 17 00:00:00 2001
From: Michael Krufky <mkrufky@linuxtv.org>
Date: Wed, 23 May 2007 19:41:06 -0400
Subject: Input: drivers/media - switch to using input_dev->dev.parent

From: Dmitry Torokhov <dtor at mail.ru>

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>
---
 linux/drivers/media/dvb/ttpci/av7110_ir.c | 4 ++++
 linux/drivers/media/dvb/ttpci/budget-ci.c | 4 ++++
 2 files changed, 8 insertions(+)

(limited to 'linux/drivers/media/dvb/ttpci')

diff --git a/linux/drivers/media/dvb/ttpci/av7110_ir.c b/linux/drivers/media/dvb/ttpci/av7110_ir.c
index 0e8484b11..e24111719 100644
--- a/linux/drivers/media/dvb/ttpci/av7110_ir.c
+++ b/linux/drivers/media/dvb/ttpci/av7110_ir.c
@@ -357,11 +357,15 @@ int __devinit av7110_ir_init(struct av7110 *av7110)
 		input_dev->id.vendor = av7110->dev->pci->vendor;
 		input_dev->id.product = av7110->dev->pci->device;
 	}
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,22)
+	input_dev->dev.parent = &av7110->dev->pci->dev;
+#else
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,15)
 	input_dev->cdev.dev = &av7110->dev->pci->dev;
 #else
 	input_dev->dev = &av7110->dev->pci->dev;
 #endif
+#endif
 #endif
 	/* initial keymap */
 	memcpy(av7110->ir.key_map, default_key_map, sizeof av7110->ir.key_map);
diff --git a/linux/drivers/media/dvb/ttpci/budget-ci.c b/linux/drivers/media/dvb/ttpci/budget-ci.c
index 302c5a786..a0e24c779 100644
--- a/linux/drivers/media/dvb/ttpci/budget-ci.c
+++ b/linux/drivers/media/dvb/ttpci/budget-ci.c
@@ -207,11 +207,15 @@ static int msp430_ir_init(struct budget_ci *budget_ci)
 		input_dev->id.vendor = saa->pci->vendor;
 		input_dev->id.product = saa->pci->device;
 	}
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,22)
+	input_dev->dev.parent = &saa->pci->dev;
+#else
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,15)
 	input_dev->cdev.dev = &saa->pci->dev;
 #else
 	input_dev->dev = &saa->pci->dev;
 #endif
+#endif
 #endif
 
 	/* Select keymap and address */
-- 
cgit v1.2.3