OSDN Git Service

[media] ivtv: Replace memcpy with struct assignment
authorEzequiel Garcia <elezegarcia@gmail.com>
Tue, 23 Oct 2012 18:57:18 +0000 (15:57 -0300)
committerMauro Carvalho Chehab <mchehab@redhat.com>
Thu, 27 Dec 2012 21:01:34 +0000 (19:01 -0200)
This kind of memcpy() is error-prone. Its replacement with a struct
assignment is prefered because it's type-safe and much easier to read.
Found by coccinelle. Hand patched and reviewed.
Tested by compilation only.
A simplified version of the semantic match that finds this problem is as
follows: (http://coccinelle.lip6.fr/)
// <smpl>
@@
identifier struct_name;
struct struct_name to;
struct struct_name from;
expression E;
@@
-memcpy(&(to), &(from), E);
+to = from;
// </smpl>

Signed-off-by: Peter Senna Tschudin <peter.senna@gmail.com>
Signed-off-by: Ezequiel Garcia <elezegarcia@gmail.com>
Signed-off-by: Andy Walls <awalls@md.metrocast.net>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
drivers/media/pci/ivtv/ivtv-i2c.c

index 46e262b..a181105 100644 (file)
@@ -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;