diff options
| -rw-r--r-- | linux/drivers/media/dvb/av7110/saa7146.c | 4 | ||||
| -rw-r--r-- | linux/drivers/media/dvb/av7110/saa7146_core.c | 4 | ||||
| -rw-r--r-- | linux/drivers/media/dvb/dvb-core/dvb_i2c.c | 17 | ||||
| -rw-r--r-- | linux/drivers/media/dvb/dvb-core/dvb_i2c.h | 19 |
4 files changed, 21 insertions, 23 deletions
diff --git a/linux/drivers/media/dvb/av7110/saa7146.c b/linux/drivers/media/dvb/av7110/saa7146.c index a636af50c..93fa074ad 100644 --- a/linux/drivers/media/dvb/av7110/saa7146.c +++ b/linux/drivers/media/dvb/av7110/saa7146.c @@ -1456,7 +1456,7 @@ int i2c_write_out(struct saa7146* saa, u32* data, int timeout) return 0; } -int clean_up(struct i2c_msg m[], int num, u32 *op) +int clean_up(const struct i2c_msg *m, int num, u32 *op) { u16 i, j; u16 op_count = 0; @@ -1475,7 +1475,7 @@ int clean_up(struct i2c_msg m[], int num, u32 *op) return 0; } -int prepare(struct i2c_msg m[], int num, u32 *op) +int prepare(const struct i2c_msg *m, int num, u32 *op) { u16 h1, h2; u16 i, j, addr; diff --git a/linux/drivers/media/dvb/av7110/saa7146_core.c b/linux/drivers/media/dvb/av7110/saa7146_core.c index 32ad80afd..f46da0156 100644 --- a/linux/drivers/media/dvb/av7110/saa7146_core.c +++ b/linux/drivers/media/dvb/av7110/saa7146_core.c @@ -195,7 +195,7 @@ static void rvfree(void* mem, int quant, u32* pt[]) /* ---------------------------------------------*/ static -int do_master_xfer (struct dvb_i2c_bus *i2c, struct i2c_msg msgs[], int num) +int do_master_xfer (struct dvb_i2c_bus *i2c, const struct i2c_msg *msgs, int num) { struct saa7146 *a = i2c->data; int count; @@ -244,7 +244,7 @@ int do_master_xfer (struct dvb_i2c_bus *i2c, struct i2c_msg msgs[], int num) static -int master_xfer (struct dvb_i2c_bus *i2c, struct i2c_msg msgs[], int num) +int master_xfer (struct dvb_i2c_bus *i2c, const struct i2c_msg *msgs, int num) { struct saa7146 *saa = i2c->data; int retries = SAA7146_I2C_RETRIES; diff --git a/linux/drivers/media/dvb/dvb-core/dvb_i2c.c b/linux/drivers/media/dvb/dvb-core/dvb_i2c.c index ce1e9705e..2c9f77e7f 100644 --- a/linux/drivers/media/dvb/dvb-core/dvb_i2c.c +++ b/linux/drivers/media/dvb/dvb-core/dvb_i2c.c @@ -168,7 +168,7 @@ void probe_devices_on_bus (struct dvb_i2c_bus *i2c) static struct dvb_i2c_bus* dvb_find_i2c_bus (int (*xfer) (struct dvb_i2c_bus *i2c, - struct i2c_msg msgs[], + const struct i2c_msg msgs[], int num), struct dvb_adapter *adapter, int id) @@ -188,12 +188,10 @@ struct dvb_i2c_bus* dvb_find_i2c_bus (int (*xfer) (struct dvb_i2c_bus *i2c, } -struct dvb_i2c_bus* dvb_register_i2c_bus (int (*xfer) (struct dvb_i2c_bus *i2c, - struct i2c_msg msgs[], - int num), - void *data, - struct dvb_adapter *adapter, - int id) +struct dvb_i2c_bus* +dvb_register_i2c_bus (int (*xfer) (struct dvb_i2c_bus *i2c, + const struct i2c_msg *msgs, int num), + void *data, struct dvb_adapter *adapter, int id) { struct dvb_i2c_bus *i2c; @@ -222,9 +220,8 @@ struct dvb_i2c_bus* dvb_register_i2c_bus (int (*xfer) (struct dvb_i2c_bus *i2c, void dvb_unregister_i2c_bus (int (*xfer) (struct dvb_i2c_bus *i2c, - struct i2c_msg msgs[], int num), - struct dvb_adapter *adapter, - int id) + const struct i2c_msg msgs[], int num), + struct dvb_adapter *adapter, int id) { struct dvb_i2c_bus *i2c; diff --git a/linux/drivers/media/dvb/dvb-core/dvb_i2c.h b/linux/drivers/media/dvb/dvb-core/dvb_i2c.h index 137e9b155..867a12c85 100644 --- a/linux/drivers/media/dvb/dvb-core/dvb_i2c.h +++ b/linux/drivers/media/dvb/dvb-core/dvb_i2c.h @@ -30,7 +30,9 @@ struct dvb_i2c_bus { struct list_head list_head; - int (*xfer) (struct dvb_i2c_bus *i2c, struct i2c_msg msgs[], int num); + int (*xfer) (struct dvb_i2c_bus *i2c, + const struct i2c_msg msgs[], + int num); void *data; struct dvb_adapter *adapter; int id; @@ -38,17 +40,16 @@ struct dvb_i2c_bus { }; -extern -struct dvb_i2c_bus* dvb_register_i2c_bus (int (*xfer) (struct dvb_i2c_bus *i2c, - struct i2c_msg msgs[], - int num), - void *data, - struct dvb_adapter *adapter, - int id); +extern struct dvb_i2c_bus* +dvb_register_i2c_bus (int (*xfer) (struct dvb_i2c_bus *i2c, + const struct i2c_msg *msgs, int num), + void *data, + struct dvb_adapter *adapter, + int id); extern void dvb_unregister_i2c_bus (int (*xfer) (struct dvb_i2c_bus *i2c, - struct i2c_msg msgs[], int num), + const struct i2c_msg msgs[], int num), struct dvb_adapter *adapter, int id); |