File tree 1 file changed +2
-9
lines changed 1 file changed +2
-9
lines changed Original file line number Diff line number Diff line change @@ -462,7 +462,6 @@ static void rpmsg_ctrldev_release_device(struct device *dev)
462
462
463
463
ida_simple_remove (& rpmsg_ctrl_ida , dev -> id );
464
464
ida_simple_remove (& rpmsg_minor_ida , MINOR (dev -> devt ));
465
- cdev_del (& ctrldev -> cdev );
466
465
kfree (ctrldev );
467
466
}
468
467
@@ -497,19 +496,13 @@ static int rpmsg_chrdev_probe(struct rpmsg_device *rpdev)
497
496
dev -> id = ret ;
498
497
dev_set_name (& ctrldev -> dev , "rpmsg_ctrl%d" , ret );
499
498
500
- ret = cdev_add (& ctrldev -> cdev , dev -> devt , 1 );
499
+ ret = cdev_device_add (& ctrldev -> cdev , & ctrldev -> dev );
501
500
if (ret )
502
501
goto free_ctrl_ida ;
503
502
504
503
/* We can now rely on the release function for cleanup */
505
504
dev -> release = rpmsg_ctrldev_release_device ;
506
505
507
- ret = device_add (dev );
508
- if (ret ) {
509
- dev_err (& rpdev -> dev , "device_add failed: %d\n" , ret );
510
- put_device (dev );
511
- }
512
-
513
506
dev_set_drvdata (& rpdev -> dev , ctrldev );
514
507
515
508
return ret ;
@@ -535,7 +528,7 @@ static void rpmsg_chrdev_remove(struct rpmsg_device *rpdev)
535
528
if (ret )
536
529
dev_warn (& rpdev -> dev , "failed to nuke endpoints: %d\n" , ret );
537
530
538
- device_del ( & ctrldev -> dev );
531
+ cdev_device_del ( & ctrldev -> cdev , & ctrldev -> dev );
539
532
put_device (& ctrldev -> dev );
540
533
}
541
534
You can’t perform that action at this time.
0 commit comments