Skip to content

Commit

Permalink
Merge pull request #338 from akolesen/rpi-3.10.y
Browse files Browse the repository at this point in the history
bcm_vc_cma: create_proc_entry replaced by proc_create
  • Loading branch information
popcornmix committed Jul 22, 2013
2 parents 66b432c + 2fa6869 commit da28efb
Showing 1 changed file with 4 additions and 6 deletions.
10 changes: 4 additions & 6 deletions drivers/char/broadcom/vc_cma/vc_cma.c
Original file line number Diff line number Diff line change
Expand Up @@ -1085,15 +1085,13 @@ static int vc_cma_init(void)
goto out_class_destroy;
}

vc_cma_proc_entry = create_proc_entry(DRIVER_NAME, 0444, NULL);
vc_cma_proc_entry = proc_create(DRIVER_NAME, 0444, NULL, &vc_cma_proc_fops);
if (vc_cma_proc_entry == NULL) {
rc = -EFAULT;
LOG_ERR("%s: create_proc_entry failed", __func__);
LOG_ERR("%s: proc_create failed", __func__);
goto out_device_destroy;
}

vc_cma_proc_entry->proc_fops = &vc_cma_proc_fops;


vc_cma_inited = 1;
return 0;

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

if (vc_cma_inited) {
remove_proc_entry(vc_cma_proc_entry->name, NULL);
remove_proc_entry(DRIVER_NAME, NULL);
device_destroy(vc_cma_class, vc_cma_devnum);
class_destroy(vc_cma_class);
cdev_del(&vc_cma_cdev);
Expand Down

0 comments on commit da28efb

Please sign in to comment.