[PATCH 4/4] drivers: staging: remove BUG_ON
drivers/staging/android/ion/ion.c calls BUG_ON in places where WARN_ON will
suffice.
This patch replaces two such occurences. Two other occurences remain.
Signed-off-by: tcharding
---
Changing the remaining two BUG_ON's causes changes to the programm logic.
This is my first patch set to the kernel, I am as such, not comfortable
changeing the logic of this file at this early stage of the game. :)
drivers/staging/android/ion/ion.c | 12 +---
1 file changed, 9 insertions(+), 3 deletions(-)
diff --git a/drivers/staging/android/ion/ion.c
b/drivers/staging/android/ion/ion.c
index 234848f..1e37f52 100644
--- a/drivers/staging/android/ion/ion.c
+++ b/drivers/staging/android/ion/ion.c
@@ -325,7 +325,7 @@ static void ion_buffer_remove_from_handle(struct ion_buffer
*buffer)
*/
mutex_lock(&buffer->lock);
buffer->handle_count--;
- BUG_ON(buffer->handle_count < 0);
+ WARN_ON(buffer->handle_count < 0);
if (!buffer->handle_count) {
struct task_struct *task;
@@ -556,7 +556,10 @@ static void ion_free_nolock(struct ion_client *client,
{
bool valid_handle;
- BUG_ON(client != handle->client);
+ if (client != handle->client) {
+ WARN(1, "%s: client != handle->client.\n", __func__);
+ return;
+ }
valid_handle = ion_handle_validate(client, handle);
@@ -569,7 +572,10 @@ static void ion_free_nolock(struct ion_client *client,
void ion_free(struct ion_client *client, struct ion_handle *handle)
{
- BUG_ON(client != handle->client);
+ if (client != handle->client) {
+ WARN(1, "%s: client != handle->client.\n", __func__);
+ return;
+ }
mutex_lock(&client->lock);
ion_free_nolock(client, handle);
--
2.7.4
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH 1/4] drivers: staging: fix parameter alignment
drivers/staging/android/ion/ion.c checkpatch produces alignment checks.
This patch is whitespace only and fixes these checks.
Signed-off-by: tcharding
---
drivers/staging/android/ion/ion.c | 64 +++
1 file changed, 32 insertions(+), 32 deletions(-)
diff --git a/drivers/staging/android/ion/ion.c
b/drivers/staging/android/ion/ion.c
index d4c6207..c4a8aef 100644
--- a/drivers/staging/android/ion/ion.c
+++ b/drivers/staging/android/ion/ion.c
@@ -174,10 +174,10 @@ static void ion_buffer_add(struct ion_device *dev,
/* this function should only be called while dev->lock is held */
static struct ion_buffer *ion_buffer_create(struct ion_heap *heap,
-struct ion_device *dev,
-unsigned long len,
-unsigned long align,
-unsigned long flags)
+ struct ion_device *dev,
+ unsigned long len,
+ unsigned long align,
+ unsigned long flags)
{
struct ion_buffer *buffer;
struct sg_table *table;
@@ -210,7 +210,7 @@ static struct ion_buffer *ion_buffer_create(struct ion_heap
*heap,
table = heap->ops->map_dma(heap, buffer);
if (WARN_ONCE(table == NULL,
- "heap->ops->map_dma should return ERR_PTR on error"))
+ "heap->ops->map_dma should return ERR_PTR on error"))
table = ERR_PTR(-EINVAL);
if (IS_ERR(table)) {
ret = -EINVAL;
@@ -337,7 +337,7 @@ static void ion_buffer_remove_from_handle(struct ion_buffer
*buffer)
}
static struct ion_handle *ion_handle_create(struct ion_client *client,
-struct ion_buffer *buffer)
+ struct ion_buffer *buffer)
{
struct ion_handle *handle;
@@ -427,7 +427,7 @@ static struct ion_handle *ion_handle_lookup(struct
ion_client *client,
}
static struct ion_handle *ion_handle_get_by_id_nolock(struct ion_client
*client,
- int id)
+ int id)
{
struct ion_handle *handle;
@@ -439,7 +439,7 @@ static struct ion_handle
*ion_handle_get_by_id_nolock(struct ion_client *client,
}
struct ion_handle *ion_handle_get_by_id(struct ion_client *client,
- int id)
+ int id)
{
struct ion_handle *handle;
@@ -592,7 +592,7 @@ int ion_phys(struct ion_client *client, struct ion_handle
*handle,
if (!buffer->heap->ops->phys) {
pr_err("%s: ion_phys is not implemented by this heap (name=%s,
type=%d).\n",
- __func__, buffer->heap->name, buffer->heap->type);
+ __func__, buffer->heap->name, buffer->heap->type);
mutex_unlock(&client->lock);
return -ENODEV;
}
@@ -612,7 +612,7 @@ static void *ion_buffer_kmap_get(struct ion_buffer *buffer)
}
vaddr = buffer->heap->ops->map_kernel(buffer->heap, buffer);
if (WARN_ONCE(vaddr == NULL,
- "heap->ops->map_kernel should return ERR_PTR on error"))
+ "heap->ops->map_kernel should return ERR_PTR on error"))
return ERR_PTR(-EINVAL);
if (IS_ERR(vaddr))
return vaddr;
@@ -781,14 +781,14 @@ static const struct file_operations debug_client_fops = {
};
static int ion_get_client_serial(const struct rb_root *root,
- const unsigned char *name)
+const unsigned char *name)
{
int serial = -1;
struct rb_node *node;
for (node = rb_first(root); node; node = rb_next(node)) {
struct ion_client *client = rb_entry(node, struct ion_client,
- node);
+node);
if (strcmp(client->name, name))
continue;
@@ -863,14 +863,14 @@ struct ion_client *ion_client_create(struct ion_device
*dev,
rb_insert_color(&client->node, &dev->clients);
client->debug_root = debugfs_create_file(client->display_name, 0664,
- dev->clients_debug_root,
- client, &debug_client_fops);
+dev->clients_debug_root,
+client, &debug_client_fops);
if (!client-&
[PATCH 0/4] drivers: staging: checkpatch fixes
drivers/staging/android/ion/ion.c produces 2 warnings and 29 checks. This patch set fixes both warnings and all but 4 of the checks. All except the last patch are trivial. Signed-off-by: tcharding --- Patch 1/4 is whitespace only. This is my first Linux kernel patch. thanks tcharding (4): staging: android: ion: fixed checkpatch alignment warnings staging: android: ion: fixed checkpatch long line warnings staging: android: ion: fixed checkpatch comparison to NULL warnings staging: android: ion: changed BUG_ON to WARN[_ON] drivers/staging/android/ion/ion.c | 88 +- 1 file changed, 48 insertions(+), 40 deletions(-) -- 2.7.4 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH 3/4] drivers: staging: remove comparison to NULL
drivers/staging/android/ion/ion.c checkpatch produces
'Comparison to NULL could be written ...' checks.
This patch replaces comparison to NULL with !var as suggested by checkpatch.
Signed-off-by: tcharding
---
drivers/staging/android/ion/ion.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/staging/android/ion/ion.c
b/drivers/staging/android/ion/ion.c
index 4e02209..234848f 100644
--- a/drivers/staging/android/ion/ion.c
+++ b/drivers/staging/android/ion/ion.c
@@ -209,7 +209,7 @@ static struct ion_buffer *ion_buffer_create(struct ion_heap
*heap,
buffer->size = len;
table = heap->ops->map_dma(heap, buffer);
- if (WARN_ONCE(table == NULL,
+ if (WARN_ONCE(!table,
"heap->ops->map_dma should return ERR_PTR on error"))
table = ERR_PTR(-EINVAL);
if (IS_ERR(table)) {
@@ -522,7 +522,7 @@ struct ion_handle *ion_alloc(struct ion_client *client,
size_t len,
}
up_read(&dev->lock);
- if (buffer == NULL)
+ if (!buffer)
return ERR_PTR(-ENODEV);
if (IS_ERR(buffer))
@@ -612,7 +612,7 @@ static void *ion_buffer_kmap_get(struct ion_buffer *buffer)
return buffer->vaddr;
}
vaddr = buffer->heap->ops->map_kernel(buffer->heap, buffer);
- if (WARN_ONCE(vaddr == NULL,
+ if (WARN_ONCE(!vaddr,
"heap->ops->map_kernel should return ERR_PTR on error"))
return ERR_PTR(-EINVAL);
if (IS_ERR(vaddr))
--
2.7.4
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH 2/4] drivers: staging: fix line length
drivers/staging/android/ion/ion.c checkpatch produces line over 80
character warnings.
This patch is whitespace only and fixes these warnings.
Signed-off-by: tcharding
---
drivers/staging/android/ion/ion.c | 6 --
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/drivers/staging/android/ion/ion.c
b/drivers/staging/android/ion/ion.c
index c4a8aef..4e02209 100644
--- a/drivers/staging/android/ion/ion.c
+++ b/drivers/staging/android/ion/ion.c
@@ -551,7 +551,8 @@ struct ion_handle *ion_alloc(struct ion_client *client,
size_t len,
}
EXPORT_SYMBOL(ion_alloc);
-static void ion_free_nolock(struct ion_client *client, struct ion_handle
*handle)
+static void ion_free_nolock(struct ion_client *client,
+ struct ion_handle *handle)
{
bool valid_handle;
@@ -1358,7 +1359,8 @@ static long ion_ioctl(struct file *filp, unsigned int
cmd, unsigned long arg)
struct ion_handle *handle;
mutex_lock(&client->lock);
- handle = ion_handle_get_by_id_nolock(client,
data.handle.handle);
+ handle = ion_handle_get_by_id_nolock(client,
+data.handle.handle);
if (IS_ERR(handle)) {
mutex_unlock(&client->lock);
return PTR_ERR(handle);
--
2.7.4
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
