Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753926AbbGAL4k (ORCPT ); Wed, 1 Jul 2015 07:56:40 -0400 Received: from sender153-mail.zoho.com ([74.201.84.153]:22476 "EHLO sender153-mail.zoho.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753249AbbGAL4e (ORCPT ); Wed, 1 Jul 2015 07:56:34 -0400 DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=zapps768; d=zoho.com; h=to:cc:from:subject:message-id:date:user-agent:mime-version:content-type; b=CacxqfT2eP/QN/Oo4NlviKq1xySDsR3rgpC8VSTZQX8T6txFG7tLZUKixa63VhwHbWunDxppMdE6 tE2NN9+TMcLMtdk3KvrsBGYbZGdxGEQ+3qJn3zVc4/3f061RJ32c To: gregkh@linuxfoundation.org, arve@android.com, riandrews@android.com, sumit.semwal@linaro.org, maarten.lankhorst@canonical.com, carlos@cgarcia.org Cc: linux-kernel@vger.kernel.org From: Sohny Thomas Subject: [PATCH] Staging: android: fix coding style and TODO file Message-ID: <5593D55C.5090108@zoho.com> Date: Wed, 1 Jul 2015 17:26:12 +0530 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.0.1 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 3599 Lines: 104 - removed non-existant issue from TODO file kuid_t or uid_t not present in staging/android - fixed 80 char limit exceeding line - a newline after decelartions as per checkpatch.pl - fixed an unnecessary typedef as reported by checkpatch.pl --- drivers/staging/android/TODO | 7 ------- drivers/staging/android/ion/ion.c | 1 + drivers/staging/android/ion/ion_chunk_heap.c | 4 ++-- drivers/staging/android/uapi/ion.h | 7 +++---- 4 files changed, 6 insertions(+), 13 deletions(-) diff --git a/drivers/staging/android/TODO b/drivers/staging/android/TODO index 06954cd..b15fb0d 100644 --- a/drivers/staging/android/TODO +++ b/drivers/staging/android/TODO @@ -5,13 +5,6 @@ TODO: - make sure things build as modules properly - add proper arch dependencies as needed - audit userspace interfaces to make sure they are sane - - kuid_t should never be exposed to user space as it is - kernel internal type. Data structure for this kuid_t is: - typedef struct { - uid_t val; - } kuid_t; - - This bug is introduced by Xiong Zhou in the patch bd471258f2e09 - - ("staging: android: logger: use kuid_t instead of uid_t") Please send patches to Greg Kroah-Hartman and Cc: Brian Swetland diff --git a/drivers/staging/android/ion/ion.c b/drivers/staging/android/ion/ion.c index 6f48112..e44f5e6 100644 --- a/drivers/staging/android/ion/ion.c +++ b/drivers/staging/android/ion/ion.c @@ -1106,6 +1106,7 @@ struct dma_buf *ion_share_dma_buf(struct ion_client *client, struct ion_buffer *buffer; struct dma_buf *dmabuf; bool valid_handle; + DEFINE_DMA_BUF_EXPORT_INFO(exp_info); mutex_lock(&client->lock); diff --git a/drivers/staging/android/ion/ion_chunk_heap.c b/drivers/staging/android/ion/ion_chunk_heap.c index 5474615..0813163 100644 --- a/drivers/staging/android/ion/ion_chunk_heap.c +++ b/drivers/staging/android/ion/ion_chunk_heap.c @@ -173,8 +173,8 @@ struct ion_heap *ion_chunk_heap_create(struct ion_platform_heap *heap_data) chunk_heap->heap.ops = &chunk_heap_ops; chunk_heap->heap.type = ION_HEAP_TYPE_CHUNK; chunk_heap->heap.flags = ION_HEAP_FLAG_DEFER_FREE; - pr_debug("%s: base %lu size %zu align %ld\n", __func__, chunk_heap->base, - heap_data->size, heap_data->align); + pr_debug("%s: base %lu size %zu align %ld\n", __func__, + chunk_heap->base, heap_data->size, heap_data->align); return &chunk_heap->heap; diff --git a/drivers/staging/android/uapi/ion.h b/drivers/staging/android/uapi/ion.h index 68a14b4..9897403 100644 --- a/drivers/staging/android/uapi/ion.h +++ b/drivers/staging/android/uapi/ion.h @@ -20,7 +20,6 @@ #include #include -typedef int ion_user_handle_t; /** * enum ion_heap_types - list of all possible types of heaps @@ -88,7 +87,7 @@ struct ion_allocation_data { size_t align; unsigned int heap_id_mask; unsigned int flags; - ion_user_handle_t handle; + int handle; }; /** @@ -102,7 +101,7 @@ struct ion_allocation_data { * provides the file descriptor and the kernel returns the handle. */ struct ion_fd_data { - ion_user_handle_t handle; + int handle; int fd; }; @@ -111,7 +110,7 @@ struct ion_fd_data { * @handle: a handle */ struct ion_handle_data { - ion_user_handle_t handle; + int handle; }; /** -- -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/