Commit ad228a34 authored by Randy Dunlap's avatar Randy Dunlap Committed by Greg Kroah-Hartman
Browse files

android: fix W=1 kernel-doc warnings 



Clean up kernel-doc notation, use correct function and parameter
names.

drivers/android/binderfs.c:236: warning: expecting prototype for binderfs_ctl_ioctl(). Prototype was for binder_ctl_ioctl() instead
drivers/android/binder.c:386: warning: expecting prototype for binder_node_unlock(). Prototype was for binder_node_inner_unlock() instead
drivers/android/binder.c:1206: warning: expecting prototype for binder_dec_ref(). Prototype was for binder_dec_ref_olocked() instead
drivers/andrond/binder.c:284: warning: Excess function parameter 'proc' description in 'binder_proc_unlock'
drivers/andrond/binder.c:387: warning: expecting prototype for binder_node_unlock(). Prototype was for binder_node_inner_unlock() instead

Signed-off-by: default avatarRandy Dunlap <rdunlap@infradead.org>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Arve Hjønnevåg <arve@android.com>
Cc: Todd Kjos <tkjos@android.com>
Cc: Martijn Coenen <maco@android.com>
Cc: Joel Fernandes <joel@joelfernandes.org>
Cc: Christian Brauner <christian@brauner.io>
Cc: Carlos Llamas <cmllamas@google.com>
Cc: Suren Baghdasaryan <surenb@google.com>
Acked-by: default avatarCarlos Llamas <cmllamas@google.com>
Link: https://lore.kernel.org/r/20230117183745.20842-1-rdunlap@infradead.org


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 0567461a

drivers/android/binder.c

+9 −9
Original line number Diff line number Diff line
@@ -281,7 +281,7 @@ _binder_proc_lock(struct binder_proc *proc, int line) 
 *

 * Release lock acquired via binder_proc_lock()

 */

#define binder_proc_unlock(_proc) _binder_proc_unlock(_proc, __LINE__)

#define binder_proc_unlock(proc) _binder_proc_unlock(proc, __LINE__)

static void

_binder_proc_unlock(struct binder_proc *proc, int line)

	__releases(&proc->outer_lock)
@@ -378,7 +378,7 @@ _binder_node_inner_lock(struct binder_node *node, int line) 
}



/**

 * binder_node_unlock() - Release node and inner locks

 * binder_node_inner_unlock() - Release node and inner locks

 * @node:         struct binder_node to acquire

 *

 * Release lock acquired via binder_node_lock()
@@ -1194,13 +1194,13 @@ static int binder_inc_ref_olocked(struct binder_ref *ref, int strong, 
}



/**

 * binder_dec_ref() - dec the ref for given handle

 * binder_dec_ref_olocked() - dec the ref for given handle

 * @ref:	ref to be decremented

 * @strong:	if true, strong decrement, else weak

 *

 * Decrement the ref.

 *

 * Return: true if ref is cleaned up and ready to be freed

 * Return: %true if ref is cleaned up and ready to be freed.

 */

static bool binder_dec_ref_olocked(struct binder_ref *ref, int strong)

{
@@ -2821,8 +2821,8 @@ static int binder_proc_transaction(struct binder_transaction *t, 
/**

 * binder_get_node_refs_for_txn() - Get required refs on node for txn

 * @node:         struct binder_node for which to get refs

 * @proc:         returns @node->proc if valid

 * @error:        if no @proc then returns BR_DEAD_REPLY

 * @procp:        returns @node->proc if valid

 * @error:        if no @procp then returns BR_DEAD_REPLY

 *

 * User-space normally keeps the node alive when creating a transaction

 * since it has a reference to the target. The local strong ref keeps it
@@ -2836,8 +2836,8 @@ static int binder_proc_transaction(struct binder_transaction *t, 
 * constructing the transaction, so we take that here as well.

 *

 * Return: The target_node with refs taken or NULL if no @node->proc is NULL.

 * Also sets @proc if valid. If the @node->proc is NULL indicating that the

 * target proc has died, @error is set to BR_DEAD_REPLY

 * Also sets @procp if valid. If the @node->proc is NULL indicating that the

 * target proc has died, @error is set to BR_DEAD_REPLY.

 */

static struct binder_node *binder_get_node_refs_for_txn(

		struct binder_node *node,

drivers/android/binderfs.c

+2 −2
Original line number Diff line number Diff line
@@ -222,14 +222,14 @@ static int binderfs_binder_device_create(struct inode *ref_inode, 
}



/**

 * binderfs_ctl_ioctl - handle binder device node allocation requests

 * binder_ctl_ioctl - handle binder device node allocation requests

 *

 * The request handler for the binder-control device. All requests operate on

 * the binderfs mount the binder-control device resides in:

 * - BINDER_CTL_ADD

 *   Allocate a new binder device.

 *

 * Return: 0 on success, negative errno on failure

 * Return: %0 on success, negative errno on failure.

 */

static long binder_ctl_ioctl(struct file *file, unsigned int cmd,

			     unsigned long arg)