1 From 6214831525192a9eb665c67fe8c93006c17acbad Mon Sep 17 00:00:00 2001
2 From: Dave Stevenson <dave.stevenson@raspberrypi.org>
3 Date: Fri, 8 Mar 2019 11:06:41 +0000
4 Subject: [PATCH] staging: vc-sm-cma: Use devm_ allocs for sm_state.
6 Use managed allocations for sm_state, removing reliance on
9 Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
11 drivers/staging/vc04_services/vc-sm-cma/vc_sm.c | 12 +++++-------
12 1 file changed, 5 insertions(+), 7 deletions(-)
14 --- a/drivers/staging/vc04_services/vc-sm-cma/vc_sm.c
15 +++ b/drivers/staging/vc04_services/vc-sm-cma/vc_sm.c
16 @@ -656,7 +656,7 @@ static void vc_sm_connected_init(void)
24 ret = vchi_connect(NULL, 0, vchi_instance);
25 @@ -665,7 +665,7 @@ static void vc_sm_connected_init(void)
33 /* Initialize an instance of the shared memory service. */
34 @@ -676,7 +676,7 @@ static void vc_sm_connected_init(void)
42 /* Create a debug fs directory entry (root). */
43 @@ -722,8 +722,7 @@ err_remove_shared_memory:
44 debugfs_remove_recursive(sm_state->dir_root);
46 vc_sm_cma_vchi_stop(&sm_state->sm_handle);
50 pr_info("[%s]: failed, ret %d\n", __func__, ret);
53 @@ -732,7 +731,7 @@ static int bcm2835_vc_sm_cma_probe(struc
55 pr_info("%s: Videocore shared memory driver\n", __func__);
57 - sm_state = kzalloc(sizeof(*sm_state), GFP_KERNEL);
58 + sm_state = devm_kzalloc(&pdev->dev, sizeof(*sm_state), GFP_KERNEL);
61 sm_state->pdev = pdev;
62 @@ -766,7 +765,6 @@ static int bcm2835_vc_sm_cma_remove(stru
64 /* Free the memory for the state structure. */
65 mutex_destroy(&sm_state->map_lock);
69 pr_debug("[%s]: end\n", __func__);