@@ -1259,8 +1259,8 @@ static int k3_r5_cluster_rproc_init(struct platform_device *pdev)
1259
1259
goto out ;
1260
1260
}
1261
1261
1262
- rproc = rproc_alloc (cdev , dev_name (cdev ), & k3_r5_rproc_ops ,
1263
- fw_name , sizeof (* kproc ));
1262
+ rproc = devm_rproc_alloc (cdev , dev_name (cdev ), & k3_r5_rproc_ops ,
1263
+ fw_name , sizeof (* kproc ));
1264
1264
if (!rproc ) {
1265
1265
ret = - ENOMEM ;
1266
1266
goto out ;
@@ -1280,15 +1280,15 @@ static int k3_r5_cluster_rproc_init(struct platform_device *pdev)
1280
1280
1281
1281
ret = k3_r5_rproc_configure_mode (kproc );
1282
1282
if (ret < 0 )
1283
- goto err_config ;
1283
+ goto out ;
1284
1284
if (ret )
1285
1285
goto init_rmem ;
1286
1286
1287
1287
ret = k3_r5_rproc_configure (kproc );
1288
1288
if (ret ) {
1289
1289
dev_err (dev , "initial configure failed, ret = %d\n" ,
1290
1290
ret );
1291
- goto err_config ;
1291
+ goto out ;
1292
1292
}
1293
1293
1294
1294
init_rmem :
@@ -1298,7 +1298,7 @@ static int k3_r5_cluster_rproc_init(struct platform_device *pdev)
1298
1298
if (ret ) {
1299
1299
dev_err (dev , "reserved memory init failed, ret = %d\n" ,
1300
1300
ret );
1301
- goto err_config ;
1301
+ goto out ;
1302
1302
}
1303
1303
1304
1304
ret = rproc_add (rproc );
@@ -1351,9 +1351,6 @@ static int k3_r5_cluster_rproc_init(struct platform_device *pdev)
1351
1351
rproc_del (rproc );
1352
1352
err_add :
1353
1353
k3_r5_reserved_mem_exit (kproc );
1354
- err_config :
1355
- rproc_free (rproc );
1356
- core -> rproc = NULL ;
1357
1354
out :
1358
1355
/* undo core0 upon any failures on core1 in split-mode */
1359
1356
if (cluster -> mode == CLUSTER_MODE_SPLIT && core == core1 ) {
@@ -1398,9 +1395,6 @@ static void k3_r5_cluster_rproc_exit(void *data)
1398
1395
rproc_del (rproc );
1399
1396
1400
1397
k3_r5_reserved_mem_exit (kproc );
1401
-
1402
- rproc_free (rproc );
1403
- core -> rproc = NULL ;
1404
1398
}
1405
1399
}
1406
1400
0 commit comments