Skip to content

Commit da28efb

Browse files
committed
Merge pull request #338 from akolesen/rpi-3.10.y
bcm_vc_cma: create_proc_entry replaced by proc_create
2 parents 66b432c + 2fa6869 commit da28efb

File tree

1 file changed

+4
-6
lines changed

1 file changed

+4
-6
lines changed

drivers/char/broadcom/vc_cma/vc_cma.c

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1085,15 +1085,13 @@ static int vc_cma_init(void)
10851085
goto out_class_destroy;
10861086
}
10871087

1088-
vc_cma_proc_entry = create_proc_entry(DRIVER_NAME, 0444, NULL);
1088+
vc_cma_proc_entry = proc_create(DRIVER_NAME, 0444, NULL, &vc_cma_proc_fops);
10891089
if (vc_cma_proc_entry == NULL) {
10901090
rc = -EFAULT;
1091-
LOG_ERR("%s: create_proc_entry failed", __func__);
1091+
LOG_ERR("%s: proc_create failed", __func__);
10921092
goto out_device_destroy;
10931093
}
1094-
1095-
vc_cma_proc_entry->proc_fops = &vc_cma_proc_fops;
1096-
1094+
10971095
vc_cma_inited = 1;
10981096
return 0;
10991097

@@ -1131,7 +1129,7 @@ static void __exit vc_cma_exit(void)
11311129
LOG_DBG("%s: called", __func__);
11321130

11331131
if (vc_cma_inited) {
1134-
remove_proc_entry(vc_cma_proc_entry->name, NULL);
1132+
remove_proc_entry(DRIVER_NAME, NULL);
11351133
device_destroy(vc_cma_class, vc_cma_devnum);
11361134
class_destroy(vc_cma_class);
11371135
cdev_del(&vc_cma_cdev);

0 commit comments

Comments
 (0)