@ -725,9 +725,9 @@ int mc_init(u64 mc_fw_addr, u64 mc_dpc_addr)
* Initialize the global default MC portal
* And check that the MC firmware is responding portal commands :
*/
root_mc_io = ( struct fsl_mc_io * ) m alloc( sizeof ( struct fsl_mc_io ) ) ;
root_mc_io = ( struct fsl_mc_io * ) c alloc( sizeof ( struct fsl_mc_io ) , 1 ) ;
if ( ! root_mc_io ) {
printf ( " No memory: m alloc() failed \n " ) ;
printf ( " No memory: c alloc() failed \n " ) ;
return - ENOMEM ;
}
@ -879,11 +879,12 @@ static int dpio_init(void)
struct dpio_cfg dpio_cfg ;
int err = 0 ;
dflt_dpio = ( struct fsl_dpio_obj * ) malloc ( sizeof ( struct fsl_dpio_obj ) ) ;
dflt_dpio = ( struct fsl_dpio_obj * ) calloc (
sizeof ( struct fsl_dpio_obj ) , 1 ) ;
if ( ! dflt_dpio ) {
printf ( " No memory: m alloc() failed \n " ) ;
printf ( " No memory: c alloc() failed \n " ) ;
err = - ENOMEM ;
goto err_m alloc ;
goto err_c alloc ;
}
dpio_cfg . channel_mode = DPIO_LOCAL_CHANNEL ;
@ -948,7 +949,7 @@ err_get_attr:
dpio_destroy ( dflt_mc_io , MC_CMD_NO_FLAGS , dflt_dpio - > dpio_handle ) ;
err_create :
free ( dflt_dpio ) ;
err_m alloc :
err_c alloc :
return err ;
}
@ -1030,11 +1031,11 @@ static int dprc_init(void)
goto err_create ;
}
dflt_mc_io = ( struct fsl_mc_io * ) m alloc( sizeof ( struct fsl_mc_io ) ) ;
dflt_mc_io = ( struct fsl_mc_io * ) c alloc( sizeof ( struct fsl_mc_io ) , 1 ) ;
if ( ! dflt_mc_io ) {
err = - ENOMEM ;
printf ( " No memory: m alloc() failed \n " ) ;
goto err_m alloc ;
printf ( " No memory: c alloc() failed \n " ) ;
goto err_c alloc ;
}
child_portal_id = MC_PORTAL_OFFSET_TO_PORTAL_ID ( mc_portal_offset ) ;
@ -1059,7 +1060,7 @@ static int dprc_init(void)
return 0 ;
err_child_open :
free ( dflt_mc_io ) ;
err_m alloc :
err_c alloc :
dprc_destroy_container ( root_mc_io , MC_CMD_NO_FLAGS ,
root_dprc_handle , child_dprc_id ) ;
err_create :
@ -1110,11 +1111,12 @@ static int dpbp_init(void)
struct dpbp_attr dpbp_attr ;
struct dpbp_cfg dpbp_cfg ;
dflt_dpbp = ( struct fsl_dpbp_obj * ) malloc ( sizeof ( struct fsl_dpbp_obj ) ) ;
dflt_dpbp = ( struct fsl_dpbp_obj * ) calloc (
sizeof ( struct fsl_dpbp_obj ) , 1 ) ;
if ( ! dflt_dpbp ) {
printf ( " No memory: m alloc() failed \n " ) ;
printf ( " No memory: c alloc() failed \n " ) ;
err = - ENOMEM ;
goto err_m alloc ;
goto err_c alloc ;
}
dpbp_cfg . options = 512 ;
@ -1164,7 +1166,7 @@ err_get_attr:
dpbp_close ( dflt_mc_io , MC_CMD_NO_FLAGS , dflt_dpbp - > dpbp_handle ) ;
dpbp_destroy ( dflt_mc_io , MC_CMD_NO_FLAGS , dflt_dpbp - > dpbp_handle ) ;
err_create :
err_m alloc :
err_c alloc :
return err ;
}
@ -1206,11 +1208,12 @@ static int dpni_init(void)
struct dpni_extended_cfg dpni_extended_cfg ;
struct dpni_cfg dpni_cfg ;
dflt_dpni = ( struct fsl_dpni_obj * ) malloc ( sizeof ( struct fsl_dpni_obj ) ) ;
dflt_dpni = ( struct fsl_dpni_obj * ) calloc (
sizeof ( struct fsl_dpni_obj ) , 1 ) ;
if ( ! dflt_dpni ) {
printf ( " No memory: m alloc() failed \n " ) ;
printf ( " No memory: c alloc() failed \n " ) ;
err = - ENOMEM ;
goto err_m alloc ;
goto err_c alloc ;
}
memset ( & dpni_extended_cfg , 0 , sizeof ( dpni_extended_cfg ) ) ;
@ -1272,7 +1275,7 @@ err_get_attr:
err_create :
err_prepare_extended_cfg :
free ( dflt_dpni ) ;
err_m alloc :
err_c alloc :
return err ;
}