V4L/DVB (13715): [Mantis] Kernel I2C changes: use PCI parent device

Signed-off-by: Manu Abraham <manu@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

diff --git a/drivers/media/dvb/mantis/mantis_common.h b/drivers/media/dvb/mantis/mantis_common.h
index d4865e4f3468f677ef3b3481c34a2734e53c860d..34d2389f312b36be973fa767510ffb4e67967b62 100644 (file)
--- a/drivers/media/dvb/mantis/mantis_common.h
+++ b/drivers/media/dvb/mantis/mantis_common.h
@@ -83,7 +83,7 @@ struct mantis_pci {
 
        u8                      latency;
 
-       struct                  pci_dev *pdev;
+       struct pci_dev          *pdev;
 
        unsigned long           mantis_addr;
        volatile void __iomem   *mantis_mmio;

diff --git a/drivers/media/dvb/mantis/mantis_i2c.c b/drivers/media/dvb/mantis/mantis_i2c.c
index 39fabe572c2e21d25562fc7ba5a6155643c9f6f1..005df1e90a166574c939414f595d549dbca558ae 100644 (file)
--- a/drivers/media/dvb/mantis/mantis_i2c.c
+++ b/drivers/media/dvb/mantis/mantis_i2c.c
@@ -161,11 +161,15 @@ static struct i2c_adapter mantis_i2c_adapter = {
 int __devinit mantis_i2c_init(struct mantis_pci *mantis)
 {
        u32 intstat, intmask;
+       struct i2c_adapter *i2c_adapter = &mantis->adapter;
+       struct pci_dev *pdev            = mantis->pdev;
 
        mutex_init(&mantis->i2c_lock);
-       memcpy(&mantis->adapter, &mantis_i2c_adapter, sizeof (mantis_i2c_adapter));
-       i2c_set_adapdata(&mantis->adapter, mantis);
-       mantis->i2c_rc = i2c_add_adapter(&mantis->adapter);
+       memcpy(i2c_adapter, &mantis_i2c_adapter, sizeof (mantis_i2c_adapter));
+       i2c_set_adapdata(i2c_adapter, mantis);
+
+       i2c_adapter->dev.parent = &pdev->dev;
+       mantis->i2c_rc          = i2c_add_adapter(i2c_adapter);
        if (mantis->i2c_rc < 0)
                return mantis->i2c_rc;