|
@@ -719,13 +719,10 @@ int init_ivtv_i2c(struct ivtv *itv)
|
|
|
return -ENODEV;
|
|
|
}
|
|
|
if (itv->options.newi2c > 0) {
|
|
|
- memcpy(&itv->i2c_adap, &ivtv_i2c_adap_hw_template,
|
|
|
- sizeof(struct i2c_adapter));
|
|
|
+ itv->i2c_adap = ivtv_i2c_adap_hw_template;
|
|
|
} else {
|
|
|
- memcpy(&itv->i2c_adap, &ivtv_i2c_adap_template,
|
|
|
- sizeof(struct i2c_adapter));
|
|
|
- memcpy(&itv->i2c_algo, &ivtv_i2c_algo_template,
|
|
|
- sizeof(struct i2c_algo_bit_data));
|
|
|
+ itv->i2c_adap = ivtv_i2c_adap_template;
|
|
|
+ itv->i2c_algo = ivtv_i2c_algo_template;
|
|
|
}
|
|
|
itv->i2c_algo.udelay = itv->options.i2c_clock_period / 2;
|
|
|
itv->i2c_algo.data = itv;
|
|
@@ -735,8 +732,7 @@ int init_ivtv_i2c(struct ivtv *itv)
|
|
|
itv->instance);
|
|
|
i2c_set_adapdata(&itv->i2c_adap, &itv->v4l2_dev);
|
|
|
|
|
|
- memcpy(&itv->i2c_client, &ivtv_i2c_client_template,
|
|
|
- sizeof(struct i2c_client));
|
|
|
+ itv->i2c_client = ivtv_i2c_client_template;
|
|
|
itv->i2c_client.adapter = &itv->i2c_adap;
|
|
|
itv->i2c_adap.dev.parent = &itv->pdev->dev;
|
|
|
|