V4L/DVB (10497): saa7146: i2c adapdata now points to v4l2_device.

Prepare for converting to v4l2_subdev.

Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

diff --git a/drivers/media/common/saa7146_core.c b/drivers/media/common/saa7146_core.c
index 961ad16e1d6f2f3a4e0e8557dddcfaa4bca909bb..a123844eb6563ba4d7446ce2c13d3a34be7a2ed7 100644 (file)
--- a/drivers/media/common/saa7146_core.c
+++ b/drivers/media/common/saa7146_core.c
@@ -516,7 +516,7 @@ err_free:
 static void saa7146_remove_one(struct pci_dev *pdev)
 {
        struct v4l2_device *v4l2_dev = pci_get_drvdata(pdev);
-       struct saa7146_dev *dev = container_of(v4l2_dev, struct saa7146_dev, v4l2_dev);
+       struct saa7146_dev *dev = to_saa7146_dev(v4l2_dev);
        struct {
                void *addr;
                dma_addr_t dma;

diff --git a/drivers/media/common/saa7146_i2c.c b/drivers/media/common/saa7146_i2c.c
index c11da4d09cd0971d17487371fd6d1b7967894ac4..1b64074a92da10c2adc95fca8cda8fcf17bbc86d 100644 (file)
--- a/drivers/media/common/saa7146_i2c.c
+++ b/drivers/media/common/saa7146_i2c.c
@@ -390,7 +390,8 @@ out:
 /* utility functions */
 static int saa7146_i2c_xfer(struct i2c_adapter* adapter, struct i2c_msg *msg, int num)
 {
-       struct saa7146_dev* dev = i2c_get_adapdata(adapter);
+       struct v4l2_device *v4l2_dev = i2c_get_adapdata(adapter);
+       struct saa7146_dev *dev = to_saa7146_dev(v4l2_dev);
 
        /* use helper function to transfer data */
        return saa7146_i2c_transfer(dev, msg, num, adapter->retries);
@@ -419,7 +420,7 @@ int saa7146_i2c_adapter_prepare(struct saa7146_dev *dev, struct i2c_adapter *i2c
 
        if( NULL != i2c_adapter ) {
                BUG_ON(!i2c_adapter->class);
-               i2c_set_adapdata(i2c_adapter,dev);
+               i2c_set_adapdata(i2c_adapter, &dev->v4l2_dev);
                i2c_adapter->dev.parent    = &dev->pci->dev;
                i2c_adapter->algo          = &saa7146_algo;
                i2c_adapter->algo_data     = NULL;

diff --git a/include/media/saa7146.h b/include/media/saa7146.h
index b9dfeeb26faea30b413f81991cdaace2d99c08a3..fff4235adae54c9901502ae973ce2c2aed585880 100644 (file)
--- a/include/media/saa7146.h
+++ b/include/media/saa7146.h
@@ -148,6 +148,11 @@ struct saa7146_dev
        struct saa7146_dma              d_rps1;
 };
 
+static inline struct saa7146_dev *to_saa7146_dev(struct v4l2_device *v4l2_dev)
+{
+       return container_of(v4l2_dev, struct saa7146_dev, v4l2_dev);
+}
+
 /* from saa7146_i2c.c */
 int saa7146_i2c_adapter_prepare(struct saa7146_dev *dev, struct i2c_adapter *i2c_adapter, u32 bitrate);