return -ENOENT;
 
        for_each_available_child_of_node(dev->of_node, child) {
+               struct cci_master *master;
                u32 idx;
 
                ret = of_property_read_u32(child, "reg", &idx);
                        continue;
                }
 
-               cci->master[idx].adap.quirks = &cci->data->quirks;
-               cci->master[idx].adap.algo = &cci_algo;
-               cci->master[idx].adap.dev.parent = dev;
-               cci->master[idx].adap.dev.of_node = of_node_get(child);
-               cci->master[idx].master = idx;
-               cci->master[idx].cci = cci;
+               master = &cci->master[idx];
+               master->adap.quirks = &cci->data->quirks;
+               master->adap.algo = &cci_algo;
+               master->adap.dev.parent = dev;
+               master->adap.dev.of_node = of_node_get(child);
+               master->master = idx;
+               master->cci = cci;
 
-               i2c_set_adapdata(&cci->master[idx].adap, &cci->master[idx]);
-               snprintf(cci->master[idx].adap.name,
-                        sizeof(cci->master[idx].adap.name), "Qualcomm-CCI");
+               i2c_set_adapdata(&master->adap, master);
+               snprintf(master->adap.name, sizeof(master->adap.name), "Qualcomm-CCI");
 
-               cci->master[idx].mode = I2C_MODE_STANDARD;
+               master->mode = I2C_MODE_STANDARD;
                ret = of_property_read_u32(child, "clock-frequency", &val);
                if (!ret) {
                        if (val == I2C_MAX_FAST_MODE_FREQ)
-                               cci->master[idx].mode = I2C_MODE_FAST;
+                               master->mode = I2C_MODE_FAST;
                        else if (val == I2C_MAX_FAST_MODE_PLUS_FREQ)
-                               cci->master[idx].mode = I2C_MODE_FAST_PLUS;
+                               master->mode = I2C_MODE_FAST_PLUS;
                }
 
-               init_completion(&cci->master[idx].irq_complete);
+               init_completion(&master->irq_complete);
        }
 
        /* Memory */