Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0741241c authored by Mike Frysinger's avatar Mike Frysinger Committed by David S. Miller
Browse files

connector: make callback argument type explicit 



The connector documentation states that the argument to the callback
function is always a pointer to a struct cn_msg, but rather than encode it
in the API itself, it uses a void pointer everywhere.  This doesn't make
much sense to encode the pointer in documentation as it prevents proper C
type checking from occurring and can easily allow people to use the wrong
pointer type.  So convert the argument type to an explicit struct cn_msg
pointer.

Signed-off-by: default avatarMike Frysinger <vapier@gentoo.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent e36aa25a

Documentation/connector/cn_test.c

+1 −3
Original line number Diff line number Diff line
@@ -32,10 +32,8 @@ static char cn_test_name[] = "cn_test"; 
static struct sock *nls;

static struct timer_list cn_test_timer;



void cn_test_callback(void *data)

void cn_test_callback(struct cn_msg *msg)

{

	struct cn_msg *msg = (struct cn_msg *)data;



	printk("%s: %lu: idx=%x, val=%x, seq=%u, ack=%u, len=%d: %s.\n",

	       __func__, jiffies, msg->id.idx, msg->id.val,

	       msg->seq, msg->ack, msg->len, (char *)msg->data);

drivers/connector/cn_proc.c

+1 −2
Original line number Diff line number Diff line
@@ -202,9 +202,8 @@ static void cn_proc_ack(int err, int rcvd_seq, int rcvd_ack) 
 * cn_proc_mcast_ctl

 * @data: message sent from userspace via the connector

 */

static void cn_proc_mcast_ctl(void *data)

static void cn_proc_mcast_ctl(struct cn_msg *msg)

{

	struct cn_msg *msg = data;

	enum proc_cn_mcast_op *mc_op = NULL;

	int err = 0;

drivers/connector/cn_queue.c

+5 −2
Original line number Diff line number Diff line
@@ -87,7 +87,9 @@ void cn_queue_wrapper(struct work_struct *work) 
	kfree(d->free);

}



static struct cn_callback_entry *cn_queue_alloc_callback_entry(char *name, struct cb_id *id, void (*callback)(void *))

static struct cn_callback_entry *

cn_queue_alloc_callback_entry(char *name, struct cb_id *id,

			      void (*callback)(struct cn_msg *))

{

	struct cn_callback_entry *cbq;
@@ -120,7 +122,8 @@ int cn_cb_equal(struct cb_id *i1, struct cb_id *i2) 
	return ((i1->idx == i2->idx) && (i1->val == i2->val));

}



int cn_queue_add_callback(struct cn_queue_dev *dev, char *name, struct cb_id *id, void (*callback)(void *))

int cn_queue_add_callback(struct cn_queue_dev *dev, char *name, struct cb_id *id,

			  void (*callback)(struct cn_msg *))

{

	struct cn_callback_entry *cbq, *__cbq;

	int found = 0;

drivers/connector/connector.c

+3 −3
Original line number Diff line number Diff line
@@ -269,7 +269,8 @@ static void cn_notify(struct cb_id *id, u32 notify_event) 
 *

 * May sleep.

 */

int cn_add_callback(struct cb_id *id, char *name, void (*callback)(void *))

int cn_add_callback(struct cb_id *id, char *name,

		    void (*callback)(struct cn_msg *))

{

	int err;

	struct cn_dev *dev = &cdev;
@@ -351,9 +352,8 @@ static int cn_ctl_msg_equals(struct cn_ctl_msg *m1, struct cn_ctl_msg *m2) 
 *

 * Used for notification of a request's processing.

 */

static void cn_callback(void *data)

static void cn_callback(struct cn_msg *msg)

{

	struct cn_msg *msg = data;

	struct cn_ctl_msg *ctl;

	struct cn_ctl_entry *ent;

	u32 size;

drivers/staging/dst/dcore.c

+1 −2
Original line number Diff line number Diff line
@@ -846,10 +846,9 @@ static dst_command_func dst_commands[] = { 
/*

 * Configuration parser.

 */

static void cn_dst_callback(void *data)

static void cn_dst_callback(struct cn_msg *msg)

{

	struct dst_ctl *ctl;

	struct cn_msg *msg = data;

	int err;

	struct dst_ctl_ack ack;

	struct dst_node *n = NULL, *tmp;