Commit 8ee18e2a authored by Christophe JAILLET's avatar Christophe JAILLET Committed by David S. Miller
Browse files

caif: Fix bitmap data type in "struct caifsock" 



Bitmap are "unsigned long", so use it instead of a "u32" to make things
more explicit.

While at it, remove some useless cast (and leading spaces) when using the
bitmap API.

Signed-off-by: default avatarChristophe JAILLET <christophe.jaillet@wanadoo.fr>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 030f21ba

net/caif/caif_socket.c

+7 −13
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ enum caif_states { 
struct caifsock {

	struct sock sk; /* must be first member */

	struct cflayer layer;

	u32 flow_state;

	unsigned long flow_state;

	struct caif_connect_request conn_req;

	struct mutex readlock;

	struct dentry *debugfs_socket_dir;
@@ -56,38 +56,32 @@ struct caifsock { 


static int rx_flow_is_on(struct caifsock *cf_sk)

{

	return test_bit(RX_FLOW_ON_BIT,

			(void *) &cf_sk->flow_state);

	return test_bit(RX_FLOW_ON_BIT, &cf_sk->flow_state);

}



static int tx_flow_is_on(struct caifsock *cf_sk)

{

	return test_bit(TX_FLOW_ON_BIT,

			(void *) &cf_sk->flow_state);

	return test_bit(TX_FLOW_ON_BIT, &cf_sk->flow_state);

}



static void set_rx_flow_off(struct caifsock *cf_sk)

{

	 clear_bit(RX_FLOW_ON_BIT,

		 (void *) &cf_sk->flow_state);

	clear_bit(RX_FLOW_ON_BIT, &cf_sk->flow_state);

}



static void set_rx_flow_on(struct caifsock *cf_sk)

{

	 set_bit(RX_FLOW_ON_BIT,

			(void *) &cf_sk->flow_state);

	set_bit(RX_FLOW_ON_BIT, &cf_sk->flow_state);

}



static void set_tx_flow_off(struct caifsock *cf_sk)

{

	 clear_bit(TX_FLOW_ON_BIT,

		(void *) &cf_sk->flow_state);

	clear_bit(TX_FLOW_ON_BIT, &cf_sk->flow_state);

}



static void set_tx_flow_on(struct caifsock *cf_sk)

{

	 set_bit(TX_FLOW_ON_BIT,

		(void *) &cf_sk->flow_state);

	set_bit(TX_FLOW_ON_BIT, &cf_sk->flow_state);

}



static void caif_read_lock(struct sock *sk)