@@ -101,9 +101,8 @@ static int mlxcpld_mux_probe(struct platform_device *pdev)
struct mlxcpld_mux_plat_data *pdata = dev_get_platdata(&pdev->dev);
struct i2c_client *client = to_i2c_client(pdev->dev.parent);
struct i2c_mux_core *muxc;
- int num, force;
struct mlxcpld_mux *data;
- int err;
+ int num, err;
if (!pdata)
return -EINVAL;
@@ -130,9 +129,7 @@ static int mlxcpld_mux_probe(struct platform_device *pdev)
/* discard unconfigured channels */
break;
- force = pdata->adap_ids[num];
-
- err = i2c_mux_add_adapter(muxc, force, num, 0);
+ err = i2c_mux_add_adapter(muxc, 0, pdata->chan_ids[num], 0);
if (err)
goto virt_reg_failed;
}
@@ -11,12 +11,12 @@
/* Platform data for the CPLD I2C multiplexers */
/* mlxcpld_mux_plat_data - per mux data, used with i2c_register_board_info
- * @adap_ids - adapter array
+ * @chan_ids - channels array
* @num_adaps - number of adapters
* @sel_reg_addr - mux select register offset in CPLD space
*/
struct mlxcpld_mux_plat_data {
- int *adap_ids;
+ int *chan_ids;
int num_adaps;
int sel_reg_addr;
};
Do not set the argument 'force_nr' of i2c_mux_add_adapter() routine, instead provide argument 'chan_id'. Rename mux ids array from 'adap_ids' to 'chan_ids'. The motivation is to prepare infrastructure to be able to: - Create only the child adapters which are actually needed - for which channel ids are specified. - To assign 'nrs' to these child adapters dynamically, with no 'nr' enforcement. Signed-off-by: Vadim Pasternak <vadimp@nvidia.com> --- v4->v5: Comments pointed out by Peter: - Move code for unconfigured channels validation from patch 5/6 to patch 3/6. v3->v4: Comments pointed out by Peter: - Extend patch with the code from the next patches dealing with argument two and three of the i2c_mux_add_adapter() routine. v2->v3: Changes added by Vadim: - Rename patch from "Rename mux ids array" to "Get rid of adapter numbers enforcement". --- drivers/i2c/muxes/i2c-mux-mlxcpld.c | 7 ++----- include/linux/platform_data/mlxcpld.h | 4 ++-- 2 files changed, 4 insertions(+), 7 deletions(-)