@@ -4830,22 +4830,20 @@ static int __init mlxplat_init(void)
48304830 nr = (nr == mlxplat_max_adap_num ) ? -1 : nr ;
48314831 if (mlxplat_i2c )
48324832 mlxplat_i2c -> regmap = priv -> regmap ;
4833- priv -> pdev_i2c = platform_device_register_resndata (
4834- & mlxplat_dev -> dev , "i2c_mlxcpld" ,
4835- nr , mlxplat_mlxcpld_resources ,
4836- ARRAY_SIZE (mlxplat_mlxcpld_resources ),
4837- mlxplat_i2c , sizeof (* mlxplat_i2c ));
4833+ priv -> pdev_i2c = platform_device_register_resndata (& mlxplat_dev -> dev , "i2c_mlxcpld" ,
4834+ nr , mlxplat_mlxcpld_resources ,
4835+ ARRAY_SIZE (mlxplat_mlxcpld_resources ),
4836+ mlxplat_i2c , sizeof (* mlxplat_i2c ));
48384837 if (IS_ERR (priv -> pdev_i2c )) {
48394838 err = PTR_ERR (priv -> pdev_i2c );
48404839 goto fail_alloc ;
48414840 }
48424841
48434842 for (i = 0 ; i < mlxplat_mux_num ; i ++ ) {
4844- priv -> pdev_mux [i ] = platform_device_register_resndata (
4845- & priv -> pdev_i2c -> dev ,
4846- "i2c-mux-reg" , i , NULL ,
4847- 0 , & mlxplat_mux_data [i ],
4848- sizeof (mlxplat_mux_data [i ]));
4843+ priv -> pdev_mux [i ] = platform_device_register_resndata (& priv -> pdev_i2c -> dev ,
4844+ "i2c-mux-reg" , i , NULL , 0 ,
4845+ & mlxplat_mux_data [i ],
4846+ sizeof (mlxplat_mux_data [i ]));
48494847 if (IS_ERR (priv -> pdev_mux [i ])) {
48504848 err = PTR_ERR (priv -> pdev_mux [i ]);
48514849 goto fail_platform_mux_register ;
@@ -4906,11 +4904,10 @@ static int __init mlxplat_init(void)
49064904 /* Add FAN driver. */
49074905 if (mlxplat_fan ) {
49084906 mlxplat_fan -> regmap = priv -> regmap ;
4909- priv -> pdev_fan = platform_device_register_resndata (
4910- & mlxplat_dev -> dev , "mlxreg-fan" ,
4911- PLATFORM_DEVID_NONE , NULL , 0 ,
4912- mlxplat_fan ,
4913- sizeof (* mlxplat_fan ));
4907+ priv -> pdev_fan = platform_device_register_resndata (& mlxplat_dev -> dev , "mlxreg-fan" ,
4908+ PLATFORM_DEVID_NONE , NULL , 0 ,
4909+ mlxplat_fan ,
4910+ sizeof (* mlxplat_fan ));
49144911 if (IS_ERR (priv -> pdev_fan )) {
49154912 err = PTR_ERR (priv -> pdev_fan );
49164913 goto fail_platform_io_regs_register ;
@@ -4924,11 +4921,10 @@ static int __init mlxplat_init(void)
49244921 for (j = 0 ; j < MLXPLAT_CPLD_WD_MAX_DEVS ; j ++ ) {
49254922 if (mlxplat_wd_data [j ]) {
49264923 mlxplat_wd_data [j ]-> regmap = priv -> regmap ;
4927- priv -> pdev_wd [j ] = platform_device_register_resndata (
4928- & mlxplat_dev -> dev , "mlx-wdt" ,
4929- j , NULL , 0 ,
4930- mlxplat_wd_data [j ],
4931- sizeof (* mlxplat_wd_data [j ]));
4924+ priv -> pdev_wd [j ] =
4925+ platform_device_register_resndata (& mlxplat_dev -> dev , "mlx-wdt" , j ,
4926+ NULL , 0 , mlxplat_wd_data [j ],
4927+ sizeof (* mlxplat_wd_data [j ]));
49324928 if (IS_ERR (priv -> pdev_wd [j ])) {
49334929 err = PTR_ERR (priv -> pdev_wd [j ]);
49344930 goto fail_platform_wd_register ;
0 commit comments