Fix several coding style errors
cover Fix several coding style errors
Fix space around operators, pointer definition, constant on the right side, assignment outside of if condition and else to follow close brace at staging: rtl8723bs: os_dep.
Guilherme Tadashi Maeoka (5):
Staging: rtl8723bs: os_dep: Fix assignment in if condition
Staging: rtl8723bs: os_dep: Fix space required coding style
Staging: rtl8723bs: os_dep: Fix else to follow close brace
Staging: rtl8723bs: os_dep: Fix space in pointer definition
Staging: rtl8723bs: os_dep: Set constant on right side
.../staging/rtl8723bs/os_dep/osdep_service.c | 52 +++++++++---------- 1 file changed, 26 insertions(+), 26 deletions(-)
Signature · 1 line
2.17.1
PATCH 1/5 Staging: rtl8723bs: os_dep: Fix assignment in if condition
Fix an assignment in if condition.
--- drivers/staging/rtl8723bs/os_dep/osdep_service.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/staging/rtl8723bs/os_dep/osdep_service.c +3 -1
@@ -162,7 +162,9 @@ static int retriveFromFile(char *path, u8 *buf, u32 sz)struct file *fp;if (path && buf) { -if (0 == (ret =openFile (&fp, path,O_RDONLY ,0 ))) { + ret =openFile (&fp, path,O_RDONLY ,0 ); + +if (ret ==0 ) {DBG_871X ("%s openFile path:%s fp =%p\n" , __func__, path , fp); oldfs =get_fs ();set_fs (KERNEL_DS );
Signature · 1 line
2.17.1
Re: [PATCH 1/5] Staging: rtl8723bs: os_dep: Fix assignment in if condition
Quoted 12 lines · Guilherme Tadashi Maeoka
Fix an assignment in if condition.
Signed-off-by Guilherme Tadashi Maeoka <[email protected]>--- drivers/staging/rtl8723bs/os_dep/osdep_service.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)drivers/staging/rtl8723bs/os_dep/osdep_service.c +0
-0
drivers/staging/rtl8723bs/os_dep/osdep_service.c static int retriveFromFile(char *path, u8 *buf, u32 sz) · line 170
Quoted 10 lines
drivers/staging/rtl8723bs/os_dep/osdep_service.c +3
-1@@ -162,7 +162,9 @@ static int retriveFromFile(char *path, u8 *buf, u32 sz)struct file *fp;if (path && buf) { -if (0 == (ret =openFile (&fp, path,O_RDONLY ,0 ))) { + ret =openFile (&fp, path,O_RDONLY ,0 ); + +if (ret ==0 ) {DBG_871X ("%s openFile path:%s fp =%p\n" , __func__, path , fp); oldfs =get_fs ();set_fs (KERNEL_DS );
More common kernel style would be to rewrite the function (and to fix the typo of retrieve) to something like:
static int retrieveFromFile(char *path, u8 *buf, u32 sz)
{
int ret;
mm_segment_t oldfs;
struct file *fp;
if (!path || !buf) {
DBG_871X("%s NULL pointer\n", __func__);
return -EINVAL;
}
ret = openFile(&fp, path, O_RDONLY, 0);
if (ret) {
DBG_871X("%s openFile path:%s Fail, ret:%d\n",
__func__, path, ret);
return ret;
}
DBG_871X("%s openFile path:%s fp =%p\n", __func__, path , fp);
oldfs = get_fs();
set_fs(KERNEL_DS);
ret = readFile(fp, buf, sz);
set_fs(oldfs);
closeFile(fp);
DBG_871X("%s readFile, ret:%d\n", __func__, ret);
return ret;
}Re: [PATCH 1/5] Staging: rtl8723bs: os_dep: Fix assignment in if condition
Thank you for the review Joe. I'll have that in mind in the next patch.
Quoted 62 lines · Joe Perches
Quoted 23 lines · Guilherme Tadashi Maeoka
Fix an assignment in if condition.
Signed-off-by Guilherme Tadashi Maeoka <[email protected]>--- drivers/staging/rtl8723bs/os_dep/osdep_service.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)drivers/staging/rtl8723bs/os_dep/osdep_service.c +3
-1@@ -162,7 +162,9 @@ static int retriveFromFile(char *path, u8 *buf, u32 sz)struct file *fp;if (path && buf) { -if (0 == (ret =openFile (&fp, path,O_RDONLY ,0 ))) { + ret =openFile (&fp, path,O_RDONLY ,0 ); + +if (ret ==0 ) {DBG_871X ("%s openFile path:%s fp =%p\n" , __func__, path , fp);Quoted 1 line
oldfs =
get_fs();set_fs(KERNEL_DS);More common kernel style would be to rewrite the function (and to fix the typo of retrieve) to something like:
static int
retrieveFromFile(char *path, u8 *buf, u32 sz){ int ret; mm_segment_t oldfs; struct file *fp; if (!path || !buf) { DBG_871X("%s NULL pointer\n", __func__); return -EINVAL; } ret = openFile(&fp, path, O_RDONLY, 0); if (ret) { DBG_871X("%s openFile path:%s Fail, ret:%d\n", __func__, path, ret); return ret; } DBG_871X("%s openFile path:%s fp =%p\n", __func__, path , fp); oldfs = get_fs(); set_fs(KERNEL_DS); ret = readFile(fp, buf, sz); set_fs(oldfs); closeFile(fp); DBG_871X("%s readFile, ret:%d\n", __func__, ret); return ret; }
Greg KH
maintainerRe: [PATCH 1/5] Staging: rtl8723bs: os_dep: Fix assignment in if condition
In reply to Guilherme Tadashi MaeokaQuoted 6 lines · Guilherme Tadashi Maeoka
Fix an assignment in if condition.
Signed-off-by Guilherme Tadashi Maeoka <[email protected]>--- drivers/staging/rtl8723bs/os_dep/osdep_service.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
Not all of these could be applied. Please rebase your patch series against my staging-testing branch and resend the remaining patches.
thanks,
greg k-h
PATCH 2/5 Staging: rtl8723bs: os_dep: Fix space required coding style
In reply to Guilherme Tadashi MaeokaFix multiple space required coding style.
--- .../staging/rtl8723bs/os_dep/osdep_service.c | 38 +++++++++---------- 1 file changed, 19 insertions(+), 19 deletions(-)
drivers/staging/rtl8723bs/os_dep/osdep_service.c +19 -19
@@ -77,13 +77,13 @@ static int openFile(struct file **fpp, char *path, int flag, int mode) {struct file *fp; - fp =filp_open (path, flag, mode); + fp =filp_open (path, flag, mode);if (IS_ERR (fp)) { *fpp =NULL ;return PTR_ERR (fp); }else { - *fpp =fp; + *fpp = fp;return 0 ; } }
@@ -106,10 +106,10 @@ static int readFile(struct file *fp, char *buf, int len)if (!fp->f_op || !fp->f_op->read)return -EPERM ; -while (sum<len) { - rlen =fp->f_op->read (fp, (char __force __user *)buf+sum, len-sum, &fp->f_pos); -if (rlen>0 ) - sum+=rlen; +while (sum < len) { + rlen = fp->f_op->read (fp, (char __force __user *)buf+sum, len-sum, &fp->f_pos); +if (rlen >0 ) + sum += rlen;else if (0 != rlen)return rlen;else
@@ -132,14 +132,14 @@ static int isFileReadable(char *path)mm_segment_t oldfs;char buf; - fp =filp_open (path,O_RDONLY ,0 ); + fp =filp_open (path,O_RDONLY ,0 );if (IS_ERR (fp)) { ret =PTR_ERR (fp); }else { oldfs =get_fs ();set_fs (KERNEL_DS ); -if (1 !=readFile (fp, &buf,1 )) +if (1 !=readFile (fp, &buf,1 )) ret = -EINVAL ;set_fs (oldfs);
@@ -157,7 +157,7 @@ static int isFileReadable(char *path)*/ static int retriveFromFile (char *path,u8 *buf,u32 sz) { -int ret =-1 ; +int ret =-1 ;mm_segment_t oldfs;struct file *fp;
@@ -165,10 +165,10 @@ static int retriveFromFile(char *path, u8 *buf, u32 sz) ret =openFile (&fp, path,O_RDONLY ,0 );if (ret ==0 ) { -DBG_871X ("%s openFile path:%s fp =%p\n" , __func__, path , fp); +DBG_871X ("%s openFile path:%s fp =%p\n" , __func__, path, fp); oldfs =get_fs ();set_fs (KERNEL_DS ); - ret =readFile (fp, buf, sz); + ret =readFile (fp, buf, sz);set_fs (oldfs);closeFile (fp);
@@ -206,8 +206,8 @@ int rtw_is_file_readable(char *path)*/ int rtw_retrive_from_file (char *path,u8 *buf,u32 sz) { -int ret =retriveFromFile (path, buf, sz); -return ret>=0 ?ret:0 ; +int ret =retriveFromFile (path, buf, sz); +return ret >=0 ? ret :0 ; }struct net_device *rtw_alloc_etherdev_with_old_priv (int sizeof_priv,void *old_priv)
@@ -220,8 +220,8 @@ struct net_device *rtw_alloc_etherdev_with_old_priv(int sizeof_priv, void *old_p goto RETURN; pnpi =netdev_priv (pnetdev); - pnpi->priv =old_priv; - pnpi->sizeof_priv =sizeof_priv; + pnpi->priv = old_priv; + pnpi->sizeof_priv = sizeof_priv; RETURN:return pnetdev;
@@ -245,7 +245,7 @@ struct net_device *rtw_alloc_etherdev(int sizeof_priv) goto RETURN; } - pnpi->sizeof_priv =sizeof_priv; + pnpi->sizeof_priv = sizeof_priv; RETURN:return pnetdev; }
@@ -293,7 +293,7 @@ int rtw_change_ifname(struct adapter *padapter, const char *ifname)else unregister_netdevice (cur_pnetdev); - rereg_priv->old_pnetdev =cur_pnetdev; + rereg_priv->old_pnetdev = cur_pnetdev; pnetdev =rtw_init_netdev (padapter);if (!pnetdev) {
@@ -388,7 +388,7 @@ void rtw_buf_update(u8 **buf, u32 *buf_len, u8 *src, u32 src_len)*/ inline bool rtw_cbuf_full (struct rtw_cbuf *cbuf) { -return (cbuf->write == cbuf->read-1 )? true : false; +return (cbuf->write == cbuf->read-1 ) ? true : false; }/**
@@ -399,7 +399,7 @@ inline bool rtw_cbuf_full(struct rtw_cbuf *cbuf)*/ inline bool rtw_cbuf_empty (struct rtw_cbuf *cbuf) { -return (cbuf->write == cbuf->read)? true : false; +return (cbuf->write == cbuf->read) ? true : false; }/**
Signature · 1 line
2.17.1
PATCH 3/5 Staging: rtl8723bs: os_dep: Fix else to follow close brace
In reply to Guilherme Tadashi MaeokaFix else not following close brace '}'.
--- drivers/staging/rtl8723bs/os_dep/osdep_service.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
drivers/staging/rtl8723bs/os_dep/osdep_service.c +2 -4
@@ -81,8 +81,7 @@ static int openFile(struct file **fpp, char *path, int flag, int mode)if (IS_ERR (fp)) { *fpp =NULL ;return PTR_ERR (fp); - } -else { + }else { *fpp = fp;return 0 ; }
@@ -135,8 +134,7 @@ static int isFileReadable(char *path) fp =filp_open (path,O_RDONLY ,0 );if (IS_ERR (fp)) { ret =PTR_ERR (fp); - } -else { + }else { oldfs =get_fs ();set_fs (KERNEL_DS );if (1 !=readFile (fp, &buf,1 ))
Signature · 1 line
2.17.1
PATCH 4/5 Staging: rtl8723bs: os_dep: Fix space in pointer definition
In reply to Guilherme Tadashi MaeokaPointer definition "foo * bar" should be "foo *bar".
--- drivers/staging/rtl8723bs/os_dep/osdep_service.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/staging/rtl8723bs/os_dep/osdep_service.c +1 -1
@@ -248,7 +248,7 @@ struct net_device *rtw_alloc_etherdev(int sizeof_priv)return pnetdev; } -void rtw_free_netdev (struct net_device * netdev) +void rtw_free_netdev (struct net_device *netdev) {struct rtw_netdev_priv_indicator *pnpi;
Signature · 1 line
2.17.1
PATCH 5/5 Staging: rtl8723bs: os_dep: Set constant on right side
In reply to Guilherme Tadashi MaeokaPlace a constant on the right side of the test.
--- drivers/staging/rtl8723bs/os_dep/osdep_service.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/staging/rtl8723bs/os_dep/osdep_service.c +2 -2
@@ -109,7 +109,7 @@ static int readFile(struct file *fp, char *buf, int len) rlen = fp->f_op->read (fp, (char __force __user *)buf+sum, len-sum, &fp->f_pos);if (rlen >0 ) sum += rlen; -else if (0 != rlen) +else if (rlen !=0 )return rlen;else break ;
@@ -137,7 +137,7 @@ static int isFileReadable(char *path) }else { oldfs =get_fs ();set_fs (KERNEL_DS ); -if (1 !=readFile (fp, &buf,1 )) +if (readFile (fp, &buf,1 ) !=1 ) ret = -EINVAL ;set_fs (oldfs);
Signature · 1 line
2.17.1
Greg KH
maintainerQuoted 11 lines · Guilherme Tadashi Maeoka
Fix space around operators, pointer definition, constant on the right side, assignment outside of if condition and else to follow close brace at staging: rtl8723bs:
os_dep.Guilherme Tadashi Maeoka (5):
Staging: rtl8723bs:os_dep: Fix assignment in if condition
Staging: rtl8723bs:os_dep: Fix space required coding style
Staging: rtl8723bs:os_dep: Fix else to follow close brace
Staging: rtl8723bs:os_dep: Fix space in pointer definition
Staging: rtl8723bs:os_dep: Set constant on right side
Quoted 2 lines
.../staging/rtl8723bs/os_dep/osdep_service.c | 52 +++++++++---------- 1 file changed, 26 insertions(+), 26 deletions(-)
The 0/X email should also say the subsystem and driver that the series modifies.
thanks,
greg k-h