Commit 45d80943 authored by Hans Verkuil's avatar Hans Verkuil Committed by Mauro Carvalho Chehab
Browse files

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



Prepare for converting to v4l2_subdev.

Signed-off-by: default avatarHans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent ef77a26b

drivers/media/common/saa7146_core.c

+1 −1
Original line number Diff line number Diff line
@@ -516,7 +516,7 @@ static int saa7146_init_one(struct pci_dev *pci, const struct pci_device_id *ent 
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;

drivers/media/common/saa7146_i2c.c

+3 −2
Original line number Diff line number Diff line
@@ -390,7 +390,8 @@ static int saa7146_i2c_transfer(struct saa7146_dev *dev, const struct i2c_msg *m 
/* 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;

include/media/saa7146.h

+5 −0
Original line number Diff line number Diff line
@@ -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);