[media] saa7164: Replace struct memcpy with struct assignment

[cascardo/linux.git] / drivers / media / video / saa7164 / saa7164-i2c.c

diff --git a/drivers/media/video/saa7164/saa7164-i2c.c b/drivers/media/video/saa7164/saa7164-i2c.c
index 26148f7..4f7e3b4 100644 (file)
--- a/drivers/media/video/saa7164/saa7164-i2c.c
+++ b/drivers/media/video/saa7164/saa7164-i2c.c
@@ -69,15 +69,6 @@ err:
        return retval;
 }
 
-void saa7164_call_i2c_clients(struct saa7164_i2c *bus, unsigned int cmd,
-       void *arg)
-{
-       if (bus->i2c_rc != 0)
-               return;
-
-       i2c_clients_command(&bus->i2c_adap, cmd, arg);
-}
-
 static u32 saa7164_functionality(struct i2c_adapter *adap)
 {
        return I2C_FUNC_I2C;
@@ -106,21 +97,14 @@ int saa7164_i2c_register(struct saa7164_i2c *bus)
 
        dprintk(DBGLVL_I2C, "%s(bus = %d)\n", __func__, bus->nr);
 
-       memcpy(&bus->i2c_adap, &saa7164_i2c_adap_template,
-              sizeof(bus->i2c_adap));
-
-       memcpy(&bus->i2c_algo, &saa7164_i2c_algo_template,
-              sizeof(bus->i2c_algo));
-
-       memcpy(&bus->i2c_client, &saa7164_i2c_client_template,
-              sizeof(bus->i2c_client));
+       bus->i2c_adap = saa7164_i2c_adap_template;
+       bus->i2c_client = saa7164_i2c_client_template;
 
        bus->i2c_adap.dev.parent = &dev->pci->dev;
 
        strlcpy(bus->i2c_adap.name, bus->dev->name,
                sizeof(bus->i2c_adap.name));
 
-       bus->i2c_algo.data = bus;
        bus->i2c_adap.algo_data = bus;
        i2c_set_adapdata(&bus->i2c_adap, bus);
        i2c_add_adapter(&bus->i2c_adap);