linux/drivers/staging/android, branch v4.9

staging: android: ion: Fix error handling in ion_query_heaps()

2016-10-24T13:36:15Z

If the copy_to_user() fails we should unlock and return directly without updating "cnt". Also the return value should be -EFAULT instead of the number of bytes remaining. Fixes: 02b23803c6af ("staging: android: ion: Add ioctl to query available heaps") Signed-off-by: Dan Carpenter Signed-off-by: Greg Kroah-Hartman

staging: android/ion: testing the wrong variable

2016-10-17T07:14:55Z

We're testing "pdev" but we intended to test "heap_pdev". This is a static checker fix and it's unlikely that anyone is affected by this bug. Fixes: 13439479c7de ('staging: ion: Add files for parsing the devicetree') Signed-off-by: Dan Carpenter Acked-by: Laura Abbott Signed-off-by: Greg Kroah-Hartman

staging: android: ion: fix checks found by checkpatch.pl

2016-10-02T14:58:29Z

Alignment fixes Signed-off-by: Wayne Porter Signed-off-by: Greg Kroah-Hartman

staging: android: ion: fix warning found by checkpatch.pl

2016-10-02T14:58:29Z

Fix checkpatch.pl warning: WARNING: braces {} are not necessary for single statement blocks Signed-off-by: Wayne Porter Signed-off-by: Greg Kroah-Hartman

staging:android:ion: Fix whitespace issue

2016-09-27T11:14:48Z

This patch fixes the following whitespace issue: CHECK: spaces preferred around that '*' (ctx:VxV) FILE: drivers/staging/android/ion/ion_of.c:91: + sizeof(struct ion_platform_heap)*num_heaps, Signed-off-by: Yannis Damigos Signed-off-by: Greg Kroah-Hartman

staging:android:ion: Fix blank line issues

2016-09-27T11:14:48Z

This patch fixes the following blank line issues: CHECK: Please don't use multiple blank lines CHECK: Please use a blank line after function/struct/union/enum declarations +} +RESERVEDMEM_OF_DECLARE(ion, "ion-region", rmem_ion_setup); Signed-off-by: Yannis Damigos Signed-off-by: Greg Kroah-Hartman

staging:android:ion: Fix alignment issues

2016-09-27T11:14:48Z

This patch fixes the following whitespace issues: CHECK: Alignment should match open parenthesis + pr_info("%s: id %d type %d name %s align %lx\n", __func__, + heap->id, heap->type, heap->name, heap->align); CHECK: Alignment should match open parenthesis +struct ion_platform_data *ion_parse_dt(struct platform_device *pdev, + struct ion_of_heap *compatible) CHECK: Alignment should match open parenthesis + heaps = devm_kzalloc(&pdev->dev, + sizeof(struct ion_platform_heap)*num_heaps, CHECK: Alignment should match open parenthesis + data = devm_kzalloc(&pdev->dev, sizeof(struct ion_platform_data), + GFP_KERNEL); CHECK: Alignment should match open parenthesis + heap_pdev = of_platform_device_create(node, heaps[i].name, + &pdev->dev); CHECK: Alignment should match open parenthesis + pr_debug("%s: heap %s base %pa size %pa dev %p\n", __func__, + heap->name, &rmem->base, &rmem->size, dev); CHECK: Alignment should match open parenthesis +static void rmem_ion_device_release(struct reserved_mem *rmem, + struct device *dev) Signed-off-by: Yannis Damigos Signed-off-by: Greg Kroah-Hartman

staging:android:ion: Fix comparison with NULL

2016-09-27T11:14:48Z

This patch fixes the following comparison with NULL issues: CHECK: Comparison to NULL could be written "compatible[i].name" + for (i = 0; compatible[i].name != NULL; i++) { CHECK: Comparison to NULL could be written "!compatible[i].name" + if (compatible[i].name == NULL) Signed-off-by: Yannis Damigos Signed-off-by: Greg Kroah-Hartman

Staging: android: fixed permissions style issue

2016-09-27T11:08:05Z

Fixed a coding style issue. Changed symbolic permissions to octal. Signed-off-by: Eric Salem Signed-off-by: Greg Kroah-Hartman

staging: ion: Align cases with switch

2016-09-25T10:37:14Z

The preferred indentation for cases and switches has the cases at the same level as the switch. Signed-off-by: Christopher H. Pezley Acked-by: Laura Abbott Signed-off-by: Greg Kroah-Hartman