diff options
author | Adrian Schmutzler <freifunk@adrianschmutzler.de> | 2020-02-08 21:58:55 +0100 |
---|---|---|
committer | Adrian Schmutzler <freifunk@adrianschmutzler.de> | 2020-02-14 14:10:51 +0100 |
commit | 7d7aa2fd924c27829ec25f825481554dd81bce97 (patch) | |
tree | 658b87b89331670266163e522ea5fb52535633cb /target/linux/bcm27xx/patches-4.19/950-0323-staging-vc-sm-cma-Use-devm_-allocs-for-sm_state.patch | |
parent | e7bfda2c243e66a75ff966ba04c28b1590b5d24c (diff) | |
download | upstream-7d7aa2fd924c27829ec25f825481554dd81bce97.tar.gz upstream-7d7aa2fd924c27829ec25f825481554dd81bce97.tar.bz2 upstream-7d7aa2fd924c27829ec25f825481554dd81bce97.zip |
brcm2708: rename target to bcm27xx
This change makes the names of Broadcom targets consistent by using
the common notation based on SoC/CPU ID (which is used internally
anyway), bcmXXXX instead of brcmXXXX.
This is even used for target TITLE in make menuconfig already,
only the short target name used brcm so far.
Despite, since subtargets range from bcm2708 to bcm2711, it seems
appropriate to use bcm27xx instead of bcm2708 (again, as already done
for BOARDNAME).
This also renames the packages brcm2708-userland and brcm2708-gpu-fw.
Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
Acked-by: Álvaro Fernández Rojas <noltari@gmail.com>
Diffstat (limited to 'target/linux/bcm27xx/patches-4.19/950-0323-staging-vc-sm-cma-Use-devm_-allocs-for-sm_state.patch')
-rw-r--r-- | target/linux/bcm27xx/patches-4.19/950-0323-staging-vc-sm-cma-Use-devm_-allocs-for-sm_state.patch | 69 |
1 files changed, 69 insertions, 0 deletions
diff --git a/target/linux/bcm27xx/patches-4.19/950-0323-staging-vc-sm-cma-Use-devm_-allocs-for-sm_state.patch b/target/linux/bcm27xx/patches-4.19/950-0323-staging-vc-sm-cma-Use-devm_-allocs-for-sm_state.patch new file mode 100644 index 0000000000..70b73dd714 --- /dev/null +++ b/target/linux/bcm27xx/patches-4.19/950-0323-staging-vc-sm-cma-Use-devm_-allocs-for-sm_state.patch @@ -0,0 +1,69 @@ +From 6214831525192a9eb665c67fe8c93006c17acbad Mon Sep 17 00:00:00 2001 +From: Dave Stevenson <dave.stevenson@raspberrypi.org> +Date: Fri, 8 Mar 2019 11:06:41 +0000 +Subject: [PATCH] staging: vc-sm-cma: Use devm_ allocs for sm_state. + +Use managed allocations for sm_state, removing reliance on +manual management. + +Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org> +--- + drivers/staging/vc04_services/vc-sm-cma/vc_sm.c | 12 +++++------- + 1 file changed, 5 insertions(+), 7 deletions(-) + +--- a/drivers/staging/vc04_services/vc-sm-cma/vc_sm.c ++++ b/drivers/staging/vc04_services/vc-sm-cma/vc_sm.c +@@ -656,7 +656,7 @@ static void vc_sm_connected_init(void) + __func__, ret); + + ret = -EIO; +- goto err_free_mem; ++ goto err_failed; + } + + ret = vchi_connect(NULL, 0, vchi_instance); +@@ -665,7 +665,7 @@ static void vc_sm_connected_init(void) + __func__, ret); + + ret = -EIO; +- goto err_free_mem; ++ goto err_failed; + } + + /* Initialize an instance of the shared memory service. */ +@@ -676,7 +676,7 @@ static void vc_sm_connected_init(void) + __func__); + + ret = -EPERM; +- goto err_free_mem; ++ goto err_failed; + } + + /* Create a debug fs directory entry (root). */ +@@ -722,8 +722,7 @@ err_remove_shared_memory: + debugfs_remove_recursive(sm_state->dir_root); + err_stop_sm_service: + vc_sm_cma_vchi_stop(&sm_state->sm_handle); +-err_free_mem: +- kfree(sm_state); ++err_failed: + pr_info("[%s]: failed, ret %d\n", __func__, ret); + } + +@@ -732,7 +731,7 @@ static int bcm2835_vc_sm_cma_probe(struc + { + pr_info("%s: Videocore shared memory driver\n", __func__); + +- sm_state = kzalloc(sizeof(*sm_state), GFP_KERNEL); ++ sm_state = devm_kzalloc(&pdev->dev, sizeof(*sm_state), GFP_KERNEL); + if (!sm_state) + return -ENOMEM; + sm_state->pdev = pdev; +@@ -766,7 +765,6 @@ static int bcm2835_vc_sm_cma_remove(stru + + /* Free the memory for the state structure. */ + mutex_destroy(&sm_state->map_lock); +- kfree(sm_state); + } + + pr_debug("[%s]: end\n", __func__); |