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

Commit e60cc3bd authored by Ben Chan's avatar Ben Chan Committed by Greg Kroah-Hartman
Browse files

staging: gdm72xx: use int instead of u32 whenever makes sense 



This patch addresses the following issues:
- Use int instead of u32 whenever makes sense
- Turn extract_qos_list() in gdm_qos.c, which previously always returned
  0, into a void function.

Reported-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
Reported-by: default avatarMichalis Pappas <mpappas@fastmail.fm>
Signed-off-by: default avatarBen Chan <benchan@chromium.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 8fea7d09

drivers/staging/gdm72xx/gdm_qos.c

+7 −8
Original line number Diff line number Diff line
@@ -142,7 +142,7 @@ void gdm_qos_release_list(void *nic_ptr) 
	free_qos_entry_list(&free_list);

}



static u32 chk_ipv4_rule(struct gdm_wimax_csr_s *csr, u8 *stream, u8 *port)

static int chk_ipv4_rule(struct gdm_wimax_csr_s *csr, u8 *stream, u8 *port)

{

	int i;
@@ -188,9 +188,9 @@ static u32 chk_ipv4_rule(struct gdm_wimax_csr_s *csr, u8 *stream, u8 *port) 
	return 0;

}



static u32 get_qos_index(struct nic *nic, u8 *iph, u8 *tcpudph)

static int get_qos_index(struct nic *nic, u8 *iph, u8 *tcpudph)

{

	u32 IP_ver, i;

	int IP_ver, i;

	struct qos_cb_s *qcb = &nic->qos;



	if (iph == NULL || tcpudph == NULL)
@@ -213,7 +213,7 @@ static u32 get_qos_index(struct nic *nic, u8 *iph, u8 *tcpudph) 
	return -1;

}



static u32 extract_qos_list(struct nic *nic, struct list_head *head)

static void extract_qos_list(struct nic *nic, struct list_head *head)

{

	struct qos_cb_s *qcb = &nic->qos;

	struct qos_entry_s *entry;
@@ -238,8 +238,6 @@ static u32 extract_qos_list(struct nic *nic, struct list_head *head) 
		if (!list_empty(&qcb->qos_list[i]))

			netdev_warn(nic->netdev, "Index(%d) is piled!!\n", i);

	}



	return 0;

}



static void send_qos_list(struct nic *nic, struct list_head *head)
@@ -305,7 +303,7 @@ int gdm_qos_send_hci_pkt(struct sk_buff *skb, struct net_device *dev) 
	return ret;

}



static u32 get_csr(struct qos_cb_s *qcb, u32 SFID, int mode)

static int get_csr(struct qos_cb_s *qcb, u32 SFID, int mode)

{

	int i;
@@ -333,7 +331,8 @@ static u32 get_csr(struct qos_cb_s *qcb, u32 SFID, int mode) 
void gdm_recv_qos_hci_packet(void *nic_ptr, u8 *buf, int size)

{

	struct nic *nic = nic_ptr;

	u32 i, SFID, index, pos;

	int i, index, pos;

	u32 SFID;

	u8 sub_cmd_evt;

	struct qos_cb_s *qcb = &nic->qos;

	struct qos_entry_s *entry, *n;

drivers/staging/gdm72xx/gdm_qos.h

+3 −3
Original line number Diff line number Diff line
@@ -59,11 +59,11 @@ struct qos_entry_s { 


struct qos_cb_s {

	struct list_head	qos_list[QOS_MAX];

	u32			qos_list_cnt;

	u32			qos_null_idx;

	int			qos_list_cnt;

	int			qos_null_idx;

	struct gdm_wimax_csr_s	csr[QOS_MAX];

	spinlock_t		qos_lock;

	u32			qos_limit_size;

	int			qos_limit_size;

};



void gdm_qos_init(void *nic_ptr);