staging/gdm72xx: Include corresponding header file (fix sparse warning)
PATCH 1/3 staging/gdm72xx: Include corresponding header file (fix sparse warning)
sdio_boot.c and netlink_k.c both have a corresponding header file with their function prototypes but fail to include them, which leads to the following sparse warnings:
sdio_boot.c:135:5: warning: symbol 'sdio_boot' was not declared. Should it be static? netlink_k.c:89:13: warning: symbol 'netlink_init' was not declared. Should it be static? netlink_k.c:109:6: warning: symbol 'netlink_exit' was not declared. Should it be static? netlink_k.c:114:5: warning: symbol 'netlink_send' was not declared. Should it be static?
-> Add the include files and silence the warning
--- drivers/staging/gdm72xx/netlink_k.c | 1 + drivers/staging/gdm72xx/sdio_boot.c | 1 + 2 files changed, 2 insertions(+), 0 deletions(-)
drivers/staging/gdm72xx/netlink_k.c +1 -0
@@ -18,6 +18,7 @@#include <linux/netlink.h> #include <asm/byteorder.h> #include <net/sock.h> +#include "netlink_k.h" #if !defined(NLMSG_HDRLEN )#define NLMSG_HDRLEN ((int) NLMSG_ALIGN(sizeof(struct nlmsghdr)))
drivers/staging/gdm72xx/sdio_boot.c +1 -0
@@ -27,6 +27,7 @@#include <linux/firmware.h> #include "gdm_sdio.h" +#include "sdio_boot.h" #define TYPE_A_HEADER_SIZE 4#define TYPE_A_LOOKAHEAD_SIZE 16
Signature · 1 line
1.7.8.6
PATCH 2/3 staging/gdm72xx: Remove unused variable in gdm_qos.c
len is never read after assignment, thus can be removed.
--- drivers/staging/gdm72xx/gdm_qos.c | 9 ++------- 1 files changed, 2 insertions(+), 7 deletions(-)
drivers/staging/gdm72xx/gdm_qos.c +2 -7
@@ -337,7 +337,6 @@ void gdm_recv_qos_hci_packet(void *nic_ptr, u8 *buf, int size)struct nic *nic = nic_ptr;u32 i,SFID , index, pos;u8 subCmdEvt; -u8 len;struct qos_cb_s *qcb = &nic->qos;struct qos_entry_s *entry, *n;struct list_head send_list;
@@ -347,8 +346,6 @@ void gdm_recv_qos_hci_packet(void *nic_ptr, u8 *buf, int size) subCmdEvt = (u8 )buf[4 ];if (subCmdEvt ==QOS_REPORT ) { - len = (u8 )buf[5 ]; -spin_lock_irqsave (&qcb->qos_lock, flags);for (i =0 ; i < qcb->qos_list_cnt; i++) {SFID = ((buf[(i*5 )+6 ]<<24 )&0xff000000 );
@@ -369,8 +366,7 @@ void gdm_recv_qos_hci_packet(void *nic_ptr, u8 *buf, int size)send_qos_list (nic, &send_list);return ; }else if (subCmdEvt ==QOS_ADD ) { - pos =5 ; - len = (u8 )buf[pos++]; + pos =6 ;SFID = ((buf[pos++]<<24 )&0xff000000 );SFID += ((buf[pos++]<<16 )&0xff0000 );
@@ -424,8 +420,7 @@ void gdm_recv_qos_hci_packet(void *nic_ptr, u8 *buf, int size) qcb->qos_limit_size =254 /qcb->qos_list_cnt;spin_unlock_irqrestore (&qcb->qos_lock, flags); }else if (subCmdEvt ==QOS_CHANGE_DEL ) { - pos =5 ; - len = (u8 )buf[pos++]; + pos =6 ;SFID = ((buf[pos++]<<24 )&0xff000000 );SFID += ((buf[pos++]<<16 )&0xff0000 );SFID += ((buf[pos++]<<8 )&0xff00 );
Signature · 1 line
1.7.8.6
PATCH 3/3 staging/gdm72xx: Remove duplicated code in gdm_qos.c
In reply to Peter HueweThe first branch of the if statement is ended with a return thus there is no need for an else if, and thus we can move the duplicated code to the top and use it for the other two branches.
--- drivers/staging/gdm72xx/gdm_qos.c | 42 +++++++++++++++---------------------- 1 files changed, 17 insertions(+), 25 deletions(-)
drivers/staging/gdm72xx/gdm_qos.c +17 -25
@@ -365,20 +365,24 @@ void gdm_recv_qos_hci_packet(void *nic_ptr, u8 *buf, int size)spin_unlock_irqrestore (&qcb->qos_lock, flags);send_qos_list (nic, &send_list);return ; - }else if (subCmdEvt ==QOS_ADD ) { - pos =6 ; - -SFID = ((buf[pos++]<<24 )&0xff000000 ); -SFID += ((buf[pos++]<<16 )&0xff0000 ); -SFID += ((buf[pos++]<<8 )&0xff00 ); -SFID += (buf[pos++]); - - index =get_csr (qcb,SFID ,1 ); -if (index ==-1 ) { -netdev_err (nic->netdev,"QoS ERROR: csr Update Error\n" ); -return ; - } + } +/* subCmdEvt == QOS_ADD || subCmdEvt == QOS_CHANG_DEL */ + pos =6 ; +SFID = ((buf[pos++]<<24 )&0xff000000 ); +SFID += ((buf[pos++]<<16 )&0xff0000 ); +SFID += ((buf[pos++]<<8 )&0xff00 ); +SFID += (buf[pos++]); + + index =get_csr (qcb,SFID ,1 ); +if (index ==-1 ) { +netdev_err (nic->netdev, +"QoS ERROR: csr Update Error / Wrong index (%d) \n" , + index); +return ; + } + +if (subCmdEvt ==QOS_ADD ) {netdev_dbg (nic->netdev,"QOS_ADD SFID = 0x%x, index=%d\n" ,SFID , index);
@@ -420,18 +424,6 @@ void gdm_recv_qos_hci_packet(void *nic_ptr, u8 *buf, int size) qcb->qos_limit_size =254 /qcb->qos_list_cnt;spin_unlock_irqrestore (&qcb->qos_lock, flags); }else if (subCmdEvt ==QOS_CHANGE_DEL ) { - pos =6 ; -SFID = ((buf[pos++]<<24 )&0xff000000 ); -SFID += ((buf[pos++]<<16 )&0xff0000 ); -SFID += ((buf[pos++]<<8 )&0xff00 ); -SFID += (buf[pos++]); - index =get_csr (qcb,SFID ,1 ); -if (index ==-1 ) { -netdev_err (nic->netdev,"QoS ERROR: Wrong index(%d)\n" , - index); -return ; - } -netdev_dbg (nic->netdev,"QOS_CHANGE_DEL SFID = 0x%x, index=%d\n" ,SFID , index);
Signature · 1 line
1.7.8.6