[PATCH 0/6] Replace container_of with list_entry
Replaces instances of container_of with list_entry to access current list element. Srishti Sharma (6): Staging: rtl8188eu: core: Use list_entry instead of container_of Staging: rtl8188eu: core: Use list_entry instead of container_of Staging: rtl8188eu: core: Use list_entry instead of container_of Staging: rtl8188eu: core: Use list_entry instead of container_of Staging: rtl8188eu: core: Use list_entry instead of container_of Staging: rtl8188eu: core: Use list_entry instead of container_of drivers/staging/rtl8188eu/core/rtw_ap.c | 14 +++--- drivers/staging/rtl8188eu/core/rtw_mlme.c | 8 drivers/staging/rtl8188eu/core/rtw_mlme_ext.c | 4 ++-- drivers/staging/rtl8188eu/core/rtw_recv.c | 14 +++--- drivers/staging/rtl8188eu/core/rtw_sta_mgt.c | 12 ++-- drivers/staging/rtl8188eu/core/rtw_xmit.c | 14 +++--- 6 files changed, 33 insertions(+), 33 deletions(-) -- 2.7.4 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH 1/6] Staging: rtl8188eu: core: Use list_entry instead of container_of
For variables of the struct list_head* use list_entry to access
current list element instead of using container_of.
Done using the following semantic patch by coccinelle.
@r@
struct list_head* l;
@@
-container_of
+list_entry
(l,...)
Signed-off-by: Srishti Sharma
---
drivers/staging/rtl8188eu/core/rtw_recv.c | 14 +++---
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/drivers/staging/rtl8188eu/core/rtw_recv.c
b/drivers/staging/rtl8188eu/core/rtw_recv.c
index 3fd5f41..af59c16 100644
--- a/drivers/staging/rtl8188eu/core/rtw_recv.c
+++ b/drivers/staging/rtl8188eu/core/rtw_recv.c
@@ -193,7 +193,7 @@ void rtw_free_recvframe_queue(struct __queue *pframequeue,
struct __queue *pfre
plist = phead->next;
while (phead != plist) {
- hdr = container_of(plist, struct recv_frame, list);
+ hdr = list_entry(plist, struct recv_frame, list);
plist = plist->next;
@@ -943,7 +943,7 @@ static int validate_recv_ctrl_frame(struct adapter
*padapter,
xmitframe_plist = xmitframe_phead->next;
if (xmitframe_phead != xmitframe_plist) {
- pxmitframe = container_of(xmitframe_plist,
struct xmit_frame, list);
+ pxmitframe = list_entry(xmitframe_plist, struct
xmit_frame, list);
xmitframe_plist = xmitframe_plist->next;
@@ -1347,7 +1347,7 @@ static struct recv_frame *recvframe_defrag(struct adapter
*adapter,
phead = get_list_head(defrag_q);
plist = phead->next;
- pfhdr = container_of(plist, struct recv_frame, list);
+ pfhdr = list_entry(plist, struct recv_frame, list);
prframe = pfhdr;
list_del_init(&(prframe->list));
@@ -1367,7 +1367,7 @@ static struct recv_frame *recvframe_defrag(struct adapter
*adapter,
plist = plist->next;
while (phead != plist) {
- pnfhdr = container_of(plist, struct recv_frame, list);
+ pnfhdr = list_entry(plist, struct recv_frame, list);
pnextrframe = pnfhdr;
/* check the fragment sequence (2nd ~n fragment frame) */
@@ -1655,7 +1655,7 @@ static int enqueue_reorder_recvframe(struct
recv_reorder_ctrl *preorder_ctrl,
plist = phead->next;
while (phead != plist) {
- hdr = container_of(plist, struct recv_frame, list);
+ hdr = list_entry(plist, struct recv_frame, list);
pnextattrib = &hdr->attrib;
if (SN_LESS(pnextattrib->seq_num, pattrib->seq_num))
@@ -1690,7 +1690,7 @@ static int recv_indicatepkts_in_order(struct adapter
*padapter, struct recv_reor
if (list_empty(phead))
return true;
- prhdr = container_of(plist, struct recv_frame, list);
+ prhdr = list_entry(plist, struct recv_frame, list);
pattrib = &prhdr->attrib;
preorder_ctrl->indicate_seq = pattrib->seq_num;
}
@@ -1698,7 +1698,7 @@ static int recv_indicatepkts_in_order(struct adapter
*padapter, struct recv_reor
/* Prepare indication list and indication. */
/* Check if there is any packet need indicate. */
while (!list_empty(phead)) {
- prhdr = container_of(plist, struct recv_frame, list);
+ prhdr = list_entry(plist, struct recv_frame, list);
prframe = prhdr;
pattrib = &prframe->attrib;
--
2.7.4
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH 2/6] Staging: rtl8188eu: core: Use list_entry instead of container_of
For variables of the type struct list_head use list_entry to access
current list element instead of using container_of.
Done using the following semantic patch by coccinelle.
@r@
struct list_head* l;
@@
-container_of
+list_entry
(l,...)
Signed-off-by: Srishti Sharma
---
drivers/staging/rtl8188eu/core/rtw_sta_mgt.c | 12 ++--
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/drivers/staging/rtl8188eu/core/rtw_sta_mgt.c
b/drivers/staging/rtl8188eu/core/rtw_sta_mgt.c
index 22cf362..f9df4ac 100644
--- a/drivers/staging/rtl8188eu/core/rtw_sta_mgt.c
+++ b/drivers/staging/rtl8188eu/core/rtw_sta_mgt.c
@@ -152,8 +152,8 @@ u32 _rtw_free_sta_priv(struct sta_priv *pstapriv)
while (phead != plist) {
int i;
- psta = container_of(plist, struct sta_info,
- hash_list);
+ psta = list_entry(plist, struct sta_info,
+ hash_list);
plist = plist->next;
for (i = 0; i < 16; i++) {
@@ -323,7 +323,7 @@ u32 rtw_free_stainfo(struct adapter *padapter, struct
sta_info *psta)
plist = phead->next;
while (!list_empty(phead)) {
- prframe = container_of(plist, struct recv_frame, list);
+ prframe = list_entry(plist, struct recv_frame, list);
plist = plist->next;
@@ -399,7 +399,7 @@ void rtw_free_all_stainfo(struct adapter *padapter)
plist = phead->next;
while (phead != plist) {
- psta = container_of(plist, struct sta_info, hash_list);
+ psta = list_entry(plist, struct sta_info, hash_list);
plist = plist->next;
@@ -435,7 +435,7 @@ struct sta_info *rtw_get_stainfo(struct sta_priv *pstapriv,
u8 *hwaddr)
plist = phead->next;
while (phead != plist) {
- psta = container_of(plist, struct sta_info, hash_list);
+ psta = list_entry(plist, struct sta_info, hash_list);
if ((!memcmp(psta->hwaddr, addr, ETH_ALEN)) == true) {
/* if found the matched address */
@@ -493,7 +493,7 @@ u8 rtw_access_ctrl(struct adapter *padapter, u8 *mac_addr)
phead = get_list_head(pacl_node_q);
plist = phead->next;
while (phead != plist) {
- paclnode = container_of(plist, struct rtw_wlan_acl_node, list);
+ paclnode = list_entry(plist, struct rtw_wlan_acl_node, list);
plist = plist->next;
if (!memcmp(paclnode->addr, mac_addr, ETH_ALEN)) {
--
2.7.4
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH 3/6] Staging: rtl8188eu: core: Use list_entry instead of container_of
For variables of the type struct list_head* use list_entry to access
current list element instead of using container_of.
Done using the following semantic patch by coccinelle.
@r@
struct list_head* l;
@@
-container_of
+list_entry
(l,...)
Signed-off-by: Srishti Sharma
---
drivers/staging/rtl8188eu/core/rtw_mlme.c | 8
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/staging/rtl8188eu/core/rtw_mlme.c
b/drivers/staging/rtl8188eu/core/rtw_mlme.c
index f663e6c..71b1f8a 100644
--- a/drivers/staging/rtl8188eu/core/rtw_mlme.c
+++ b/drivers/staging/rtl8188eu/core/rtw_mlme.c
@@ -198,7 +198,7 @@ struct wlan_network *rtw_find_network(struct __queue
*scanned_queue, u8 *addr)
plist = phead->next;
while (plist != phead) {
- pnetwork = container_of(plist, struct wlan_network, list);
+ pnetwork = list_entry(plist, struct wlan_network, list);
if (!memcmp(addr, pnetwork->network.MacAddress, ETH_ALEN))
break;
plist = plist->next;
@@ -223,7 +223,7 @@ void rtw_free_network_queue(struct adapter *padapter, u8
isfreeall)
plist = phead->next;
while (phead != plist) {
- pnetwork = container_of(plist, struct wlan_network, list);
+ pnetwork = list_entry(plist, struct wlan_network, list);
plist = plist->next;
@@ -342,7 +342,7 @@ struct wlan_network
*rtw_get_oldest_wlan_network(struct __queue *scanned_queue)
phead = get_list_head(scanned_queue);
for (plist = phead->next; plist != phead; plist = plist->next) {
- pwlan = container_of(plist, struct wlan_network, list);
+ pwlan = list_entry(plist, struct wlan_network, list);
if (!pwlan->fixed) {
if (!oldest || time_after(oldest->last_scanned,
pwlan->last_scanned))
@@ -421,7 +421,7 @@ void rtw_update_scanned_network(struct adapter *adapter,
struct wlan_bssid_ex *t
plist = phead->next;
while (phead != plist) {
- pnetwork= container_of(plist, struct wlan_network,
list);
+ pnetwork= list_entry(plist, struct wlan_network, list);
if (is_same_network(&(pnetwork->network), target))
break;
--
2.7.4
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH 4/6] Staging: rtl8188eu: core: Use list_entry instead of container_of
For variables of the type struct list_head* use list_entry to access
current list element instead of using container_of. Done using the
following semantic patch by coccinelle.
@r@
struct list_head* l;
@@
-container_of
+list_entry
(l,...)
Signed-off-by: Srishti Sharma
---
drivers/staging/rtl8188eu/core/rtw_ap.c | 14 +++---
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/drivers/staging/rtl8188eu/core/rtw_ap.c
b/drivers/staging/rtl8188eu/core/rtw_ap.c
index 32a4837..35c03d8 100644
--- a/drivers/staging/rtl8188eu/core/rtw_ap.c
+++ b/drivers/staging/rtl8188eu/core/rtw_ap.c
@@ -293,7 +293,7 @@ voidexpire_timeout_chk(struct adapter *padapter)
/* check auth_queue */
while (phead != plist) {
- psta = container_of(plist, struct sta_info, auth_list);
+ psta = list_entry(plist, struct sta_info, auth_list);
plist = plist->next;
if (psta->expire_to > 0) {
@@ -327,7 +327,7 @@ voidexpire_timeout_chk(struct adapter *padapter)
/* check asoc_queue */
while (phead != plist) {
- psta = container_of(plist, struct sta_info, asoc_list);
+ psta = list_entry(plist, struct sta_info, asoc_list);
plist = plist->next;
if (chk_sta_is_alive(psta) || !psta->expire_to) {
@@ -1149,7 +1149,7 @@ int rtw_acl_add_sta(struct adapter *padapter, u8 *addr)
plist = phead->next;
while (phead != plist) {
- paclnode = container_of(plist, struct rtw_wlan_acl_node, list);
+ paclnode = list_entry(plist, struct rtw_wlan_acl_node, list);
plist = plist->next;
if (!memcmp(paclnode->addr, addr, ETH_ALEN)) {
@@ -1209,7 +1209,7 @@ int rtw_acl_remove_sta(struct adapter *padapter, u8 *addr)
plist = phead->next;
while (phead != plist) {
- paclnode = container_of(plist, struct rtw_wlan_acl_node, list);
+ paclnode = list_entry(plist, struct rtw_wlan_acl_node, list);
plist = plist->next;
if (!memcmp(paclnode->addr, addr, ETH_ALEN)) {
@@ -1456,7 +1456,7 @@ void associated_clients_update(struct adapter *padapter,
u8 updated)
/* check asoc_queue */
while (phead != plist) {
- psta = container_of(plist, struct sta_info, asoc_list);
+ psta = list_entry(plist, struct sta_info, asoc_list);
plist = plist->next;
@@ -1728,7 +1728,7 @@ int rtw_sta_flush(struct adapter *padapter)
/* free sta asoc_queue */
while (phead != plist) {
- psta = container_of(plist, struct sta_info, asoc_list);
+ psta = list_entry(plist, struct sta_info, asoc_list);
plist = plist->next;
@@ -1856,7 +1856,7 @@ void stop_ap_mode(struct adapter *padapter)
phead = get_list_head(pacl_node_q);
plist = phead->next;
while (phead != plist) {
- paclnode = container_of(plist, struct rtw_wlan_acl_node, list);
+ paclnode = list_entry(plist, struct rtw_wlan_acl_node, list);
plist = plist->next;
if (paclnode->valid) {
--
2.7.4
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH 5/6] Staging: rtl8188eu: core: Use list_entry instead of container_of
For variables of type struct list_head* use list_entry to access
current list element instead of using container_of. Done using
the following semantic patch by coccinelle.
@r@
struct list_head* l;
@@
-container_of
+list_entry
(l,...)
Signed-off-by: Srishti Sharma
---
drivers/staging/rtl8188eu/core/rtw_mlme_ext.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/staging/rtl8188eu/core/rtw_mlme_ext.c
b/drivers/staging/rtl8188eu/core/rtw_mlme_ext.c
index 611c940..80fe6ae 100644
--- a/drivers/staging/rtl8188eu/core/rtw_mlme_ext.c
+++ b/drivers/staging/rtl8188eu/core/rtw_mlme_ext.c
@@ -1790,7 +1790,7 @@ static void issue_action_BSSCoexistPacket(struct adapter
*padapter)
u8 *p;
struct wlan_bssid_ex *pbss_network;
- pnetwork = container_of(plist, struct wlan_network,
list);
+ pnetwork = list_entry(plist, struct wlan_network, list);
plist = plist->next;
@@ -5470,7 +5470,7 @@ u8 tx_beacon_hdl(struct adapter *padapter, unsigned char
*pbuf)
xmitframe_plist = xmitframe_phead->next;
while (xmitframe_phead != xmitframe_plist) {
- pxmitframe = container_of(xmitframe_plist,
struct xmit_frame, list);
+ pxmitframe = list_entry(xmitframe_plist, struct
xmit_frame, list);
xmitframe_plist = xmitframe_plist->next;
--
2.7.4
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH 6/6] Staging: rtl8188eu: core: Use list_entry instead of container_of
For variables of type struct list_head* use list_entry to access
current list element instead of using container_of. Done by the
following semantic patch by coccinelle.
@r@
struct list_head* l;
@@
-container_of
+list_entry
(l,...)
Signed-off-by: Srishti Sharma
---
drivers/staging/rtl8188eu/core/rtw_xmit.c | 14 +++---
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/drivers/staging/rtl8188eu/core/rtw_xmit.c
b/drivers/staging/rtl8188eu/core/rtw_xmit.c
index be2f46e..29e9ee9 100644
--- a/drivers/staging/rtl8188eu/core/rtw_xmit.c
+++ b/drivers/staging/rtl8188eu/core/rtw_xmit.c
@@ -1401,7 +1401,7 @@ void rtw_free_xmitframe_queue(struct xmit_priv
*pxmitpriv, struct __queue *pfram
plist = phead->next;
while (phead != plist) {
- pxmitframe = container_of(plist, struct xmit_frame, list);
+ pxmitframe = list_entry(plist, struct xmit_frame, list);
plist = plist->next;
@@ -1432,7 +1432,7 @@ static struct xmit_frame *dequeue_one_xmitframe(struct
xmit_priv *pxmitpriv, str
xmitframe_plist = xmitframe_phead->next;
if (xmitframe_phead != xmitframe_plist) {
- pxmitframe = container_of(xmitframe_plist, struct xmit_frame,
list);
+ pxmitframe = list_entry(xmitframe_plist, struct xmit_frame,
list);
xmitframe_plist = xmitframe_plist->next;
@@ -1473,7 +1473,7 @@ struct xmit_frame *rtw_dequeue_xframe(struct xmit_priv
*pxmitpriv, struct hw_xmi
sta_plist = sta_phead->next;
while (sta_phead != sta_plist) {
- ptxservq = container_of(sta_plist, struct tx_servq,
tx_pending);
+ ptxservq = list_entry(sta_plist, struct tx_servq,
tx_pending);
pframe_queue = &ptxservq->sta_pending;
@@ -1811,7 +1811,7 @@ static void dequeue_xmitframes_to_sleeping_queue(struct
adapter *padapter, struc
plist = phead->next;
while (phead != plist) {
- pxmitframe = container_of(plist, struct xmit_frame, list);
+ pxmitframe = list_entry(plist, struct xmit_frame, list);
plist = plist->next;
@@ -1878,7 +1878,7 @@ void wakeup_sta_to_xmit(struct adapter *padapter, struct
sta_info *psta)
xmitframe_plist = xmitframe_phead->next;
while (xmitframe_phead != xmitframe_plist) {
- pxmitframe = container_of(xmitframe_plist, struct xmit_frame,
list);
+ pxmitframe = list_entry(xmitframe_plist, struct xmit_frame,
list);
xmitframe_plist = xmitframe_plist->next;
@@ -1959,7 +1959,7 @@ void wakeup_sta_to_xmit(struct adapter *padapter, struct
sta_info *psta)
xmitframe_plist = xmitframe_phead->next;
while (xmitframe_phead != xmitframe_plist) {
- pxmitframe = container_of(xmitframe_plist, struct
xmit_frame, list);
+ pxmitframe = list_entry(xmitframe_plist, struct
xmit_frame, list);
xmitframe_plist = xmitframe_plist->next;
@@ -2006,7 +2006,7 @@ void xmit_delivery_enabled_frames(struct adapter
*padapter, struct sta_info *pst
xmitframe_plist = xmitframe_phead->next;
while (xmitframe_phead != xmitframe_plist) {
- pxmitframe = container_of(xmitframe_plist, struct xmit_frame,
list);
+ pxmitframe = list_entry(xmitframe_plist, struct xmit_frame,
list);
xmitframe_plist = xmitframe_plist->next;
--
2.7.4
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH v2] Staging: rtl8723bs: Remove unnecessary comments.
This patch removes unnecessary comments which are there
to explain why call to memset is in comments. Both of the
comments are not needed as they are not very useful.
Signed-off-by: Shreeya Patel
---
Changes in v2:
-Remove some more unnecessary comments and make the
commit message more appropriate.
drivers/staging/rtl8723bs/core/rtw_mlme.c | 3 ---
drivers/staging/rtl8723bs/core/rtw_mlme_ext.c | 3 ---
drivers/staging/rtl8723bs/core/rtw_pwrctrl.c | 2 --
drivers/staging/rtl8723bs/core/rtw_recv.c | 4
drivers/staging/rtl8723bs/core/rtw_xmit.c | 3 ---
5 files changed, 15 deletions(-)
diff --git a/drivers/staging/rtl8723bs/core/rtw_mlme.c
b/drivers/staging/rtl8723bs/core/rtw_mlme.c
index 6b77820..5b583f7 100644
--- a/drivers/staging/rtl8723bs/core/rtw_mlme.c
+++ b/drivers/staging/rtl8723bs/core/rtw_mlme.c
@@ -28,9 +28,6 @@ sint _rtw_init_mlme_priv(struct adapter *padapter)
struct mlme_priv*pmlmepriv = &padapter->mlmepriv;
sintres = _SUCCESS;
- /* We don't need to memset padapter->XXX to zero, because adapter is
allocated by vzalloc(). */
- /* memset((u8 *)pmlmepriv, 0, sizeof(struct mlme_priv)); */
-
pmlmepriv->nic_hdl = (u8 *)padapter;
pmlmepriv->pscanned = NULL;
diff --git a/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c
b/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c
index b6d137f..ca35c1c 100644
--- a/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c
+++ b/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c
@@ -474,9 +474,6 @@ int init_mlme_ext_priv(struct adapter *padapter)
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);
- /* We don't need to memset padapter->XXX to zero, because adapter is
allocated by vzalloc(). */
- /* memset((u8 *)pmlmeext, 0, sizeof(struct mlme_ext_priv)); */
-
pmlmeext->padapter = padapter;
/* fill_fwpriv(padapter, &(pmlmeext->fwpriv)); */
diff --git a/drivers/staging/rtl8723bs/core/rtw_pwrctrl.c
b/drivers/staging/rtl8723bs/core/rtw_pwrctrl.c
index aabdaaf..820a061 100644
--- a/drivers/staging/rtl8723bs/core/rtw_pwrctrl.c
+++ b/drivers/staging/rtl8723bs/core/rtw_pwrctrl.c
@@ -1193,8 +1193,6 @@ void rtw_init_pwrctrl_priv(struct adapter *padapter)
void rtw_free_pwrctrl_priv(struct adapter *adapter)
{
- /* memset((unsigned char *)pwrctrlpriv, 0, sizeof(struct
pwrctrl_priv)); */
-
#ifdef CONFIG_PNO_SUPPORT
if (pwrctrlpriv->pnlo_info != NULL)
printk("** pnlo_info memory leak\n");
diff --git a/drivers/staging/rtl8723bs/core/rtw_recv.c
b/drivers/staging/rtl8723bs/core/rtw_recv.c
index 68a6303..73e6e41 100644
--- a/drivers/staging/rtl8723bs/core/rtw_recv.c
+++ b/drivers/staging/rtl8723bs/core/rtw_recv.c
@@ -46,9 +46,6 @@ sint _rtw_init_recv_priv(struct recv_priv *precvpriv, struct
adapter *padapter)
union recv_frame *precvframe;
sintres = _SUCCESS;
- /* We don't need to memset padapter->XXX to zero, because adapter is
allocated by vzalloc(). */
- /* memset((unsigned char *)precvpriv, 0, sizeof (struct recv_priv)); */
-
spin_lock_init(&precvpriv->lock);
_rtw_init_queue(&precvpriv->free_recv_queue);
@@ -65,7 +62,6 @@ sint _rtw_init_recv_priv(struct recv_priv *precvpriv, struct
adapter *padapter)
res = _FAIL;
goto exit;
}
- /* memset(precvpriv->pallocated_frame_buf, 0, NR_RECVFRAME *
sizeof(union recv_frame) + RXFRAME_ALIGN_SZ); */
precvpriv->precv_frame_buf = (u8
*)N_BYTE_ALIGMENT((SIZE_PTR)(precvpriv->pallocated_frame_buf),
RXFRAME_ALIGN_SZ);
/* precvpriv->precv_frame_buf = precvpriv->pallocated_frame_buf +
RXFRAME_ALIGN_SZ - */
diff --git a/drivers/staging/rtl8723bs/core/rtw_xmit.c
b/drivers/staging/rtl8723bs/core/rtw_xmit.c
index 022f654..8cd05f8 100644
--- a/drivers/staging/rtl8723bs/core/rtw_xmit.c
+++ b/drivers/staging/rtl8723bs/core/rtw_xmit.c
@@ -51,9 +51,6 @@ s32 _rtw_init_xmit_priv(struct xmit_priv *pxmitpriv, struct
adapter *padapter)
struct xmit_frame *pxframe;
sintres = _SUCCESS;
- /* We don't need to memset padapter->XXX to zero, because adapter is
allocated by vzalloc(). */
- /* memset((unsigned char *)pxmitpriv, 0, sizeof(struct xmit_priv)); */
-
spin_lock_init(&pxmitpriv->lock);
spin_lock_init(&pxmitpriv->lock_sctx);
sema_init(&pxmitpriv->xmit_sema, 0);
--
2.7.4
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
Re: [Outreachy kernel] [PATCH 6/6] Staging: rtl8188eu: core: Use list_entry instead of container_of
On Sat, 30 Sep 2017, Srishti Sharma wrote:
> For variables of type struct list_head* use list_entry to access
> current list element instead of using container_of. Done by the
> following semantic patch by coccinelle.
>
> @r@
> struct list_head* l;
> @@
>
> -container_of
> +list_entry
> (l,...)
>
> Signed-off-by: Srishti Sharma
> ---
> drivers/staging/rtl8188eu/core/rtw_xmit.c | 14 +++---
> 1 file changed, 7 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/staging/rtl8188eu/core/rtw_xmit.c
> b/drivers/staging/rtl8188eu/core/rtw_xmit.c
> index be2f46e..29e9ee9 100644
> --- a/drivers/staging/rtl8188eu/core/rtw_xmit.c
> +++ b/drivers/staging/rtl8188eu/core/rtw_xmit.c
> @@ -1401,7 +1401,7 @@ void rtw_free_xmitframe_queue(struct xmit_priv
> *pxmitpriv, struct __queue *pfram
> plist = phead->next;
>
> while (phead != plist) {
> - pxmitframe = container_of(plist, struct xmit_frame, list);
> + pxmitframe = list_entry(plist, struct xmit_frame, list);
>
> plist = plist->next;
It looks to me like this loop could be rewritten using
list_for_each_entry_safe. The entry is because you only do something
interesting with the entry and the safe is because the elements of the
list are deleted along the way. Perhaps the others canbe changed this way
too.
julia
>
> @@ -1432,7 +1432,7 @@ static struct xmit_frame *dequeue_one_xmitframe(struct
> xmit_priv *pxmitpriv, str
> xmitframe_plist = xmitframe_phead->next;
>
> if (xmitframe_phead != xmitframe_plist) {
> - pxmitframe = container_of(xmitframe_plist, struct xmit_frame,
> list);
> + pxmitframe = list_entry(xmitframe_plist, struct xmit_frame,
> list);
>
> xmitframe_plist = xmitframe_plist->next;
>
> @@ -1473,7 +1473,7 @@ struct xmit_frame *rtw_dequeue_xframe(struct xmit_priv
> *pxmitpriv, struct hw_xmi
> sta_plist = sta_phead->next;
>
> while (sta_phead != sta_plist) {
> - ptxservq = container_of(sta_plist, struct tx_servq,
> tx_pending);
> + ptxservq = list_entry(sta_plist, struct tx_servq,
> tx_pending);
>
> pframe_queue = &ptxservq->sta_pending;
>
> @@ -1811,7 +1811,7 @@ static void dequeue_xmitframes_to_sleeping_queue(struct
> adapter *padapter, struc
> plist = phead->next;
>
> while (phead != plist) {
> - pxmitframe = container_of(plist, struct xmit_frame, list);
> + pxmitframe = list_entry(plist, struct xmit_frame, list);
>
> plist = plist->next;
>
> @@ -1878,7 +1878,7 @@ void wakeup_sta_to_xmit(struct adapter *padapter,
> struct sta_info *psta)
> xmitframe_plist = xmitframe_phead->next;
>
> while (xmitframe_phead != xmitframe_plist) {
> - pxmitframe = container_of(xmitframe_plist, struct xmit_frame,
> list);
> + pxmitframe = list_entry(xmitframe_plist, struct xmit_frame,
> list);
>
> xmitframe_plist = xmitframe_plist->next;
>
> @@ -1959,7 +1959,7 @@ void wakeup_sta_to_xmit(struct adapter *padapter,
> struct sta_info *psta)
> xmitframe_plist = xmitframe_phead->next;
>
> while (xmitframe_phead != xmitframe_plist) {
> - pxmitframe = container_of(xmitframe_plist, struct
> xmit_frame, list);
> + pxmitframe = list_entry(xmitframe_plist, struct
> xmit_frame, list);
>
> xmitframe_plist = xmitframe_plist->next;
>
> @@ -2006,7 +2006,7 @@ void xmit_delivery_enabled_frames(struct adapter
> *padapter, struct sta_info *pst
> xmitframe_plist = xmitframe_phead->next;
>
> while (xmitframe_phead != xmitframe_plist) {
> - pxmitframe = container_of(xmitframe_plist, struct xmit_frame,
> list);
> + pxmitframe = list_entry(xmitframe_plist, struct xmit_frame,
> list);
>
> xmitframe_plist = xmitframe_plist->next;
>
> --
> 2.7.4
>
> --
> You received this message because you are subscribed to the Google Groups
> "outreachy-kernel" group.
> To unsubscribe from this group and stop receiving emails from it, send an
> email to outreachy-kernel+unsubscr...@googlegroups.com.
> To post to this group, send email to outreachy-ker...@googlegroups.com.
> To view this discussion on the web visit
> https://groups.google.com/d/msgid/outreachy-kernel/778fb00439b44bd4a9e1ef06b1d619f9e4f5525f.1506755266.git.srishtishar%40gmail.com.
> For more options, visit https://groups.google.com/d/optout.
>
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
Re: [PATCH RFC] media: staging/imx: fix complete handler
Em Fri, 29 Sep 2017 22:38:39 +0100
Russell King escreveu:
> The complete handler walks all entities, expecting to find an imx
> subdevice for each and every entity.
>
> However, camera drivers such as smiapp can themselves contain multiple
> entities, for which there will not be an imx subdevice. This causes
> imx_media_find_subdev_by_sd() to fail, making the imx capture system
> unusable with such cameras.
>
> Work around this by killing the error entirely, thereby allowing
> the imx capture to be used with such cameras.
>
> Signed-off-by: Russell King
> ---
> Not the best solution, but the only one I can think of to fix the
> regression that happened sometime between a previous revision of
> Steve's patch set and the version that got merged.
Yeah, ideally, the complete handling should somehow be aware
about smiapp entities and do the right thing, instead of
just ignoring the errors.
Sakari,
What do you think?
Regards,
Mauro
>
> drivers/staging/media/imx/imx-media-dev.c | 7 +--
> 1 file changed, 5 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/staging/media/imx/imx-media-dev.c
> b/drivers/staging/media/imx/imx-media-dev.c
> index d96f4512224f..6ba59939dd7a 100644
> --- a/drivers/staging/media/imx/imx-media-dev.c
> +++ b/drivers/staging/media/imx/imx-media-dev.c
> @@ -345,8 +345,11 @@ static int imx_media_add_vdev_to_pad(struct
> imx_media_dev *imxmd,
>
> sd = media_entity_to_v4l2_subdev(entity);
> imxsd = imx_media_find_subdev_by_sd(imxmd, sd);
> - if (IS_ERR(imxsd))
> - return PTR_ERR(imxsd);
> + if (IS_ERR(imxsd)) {
> + v4l2_err(&imxmd->v4l2_dev, "failed to find subdev for entity
> %s, sd %p err %ld\n",
> + entity->name, sd, PTR_ERR(imxsd));
> + return 0;
> + }
>
> imxpad = &imxsd->pad[srcpad->index];
> vdev_idx = imxpad->num_vdevs;
Thanks,
Mauro
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
Re: [PATCH v2] Staging: rtl8723bs: Remove unnecessary comments.
Hi Shreeya, We don't usually add a period to the subject line for kernel patches. (reason: we only have about 52 characters for the commit brief description so best not to waste any). On Sat, Sep 30, 2017 at 01:30:34PM +0530, Shreeya Patel wrote: > This patch removes unnecessary comments which are there > to explain why call to memset is in comments. Both of the > comments are not needed as they are not very useful. You may like to read Documentation/process/submitting-patches.rst (specifically section 2) for tips on writing your git log. Describe your changes in imperative mood, e.g. "make xyzzy do frotz" instead of "[This patch] makes xyzzy do frotz" or "[I] changed xyzzy to do frotz", as if you are giving orders to the codebase to change its behaviour. Good luck, Tobin. ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
Re: [PATCH 0/6] Replace container_of with list_entry
On Sat, Sep 30, 2017 at 12:49:00PM +0530, Srishti Sharma wrote: > Replaces instances of container_of with list_entry to > access current list element. > > Srishti Sharma (6): > Staging: rtl8188eu: core: Use list_entry instead of container_of > Staging: rtl8188eu: core: Use list_entry instead of container_of > Staging: rtl8188eu: core: Use list_entry instead of container_of > Staging: rtl8188eu: core: Use list_entry instead of container_of > Staging: rtl8188eu: core: Use list_entry instead of container_of > Staging: rtl8188eu: core: Use list_entry instead of container_of You may have trouble getting patches merged with duplicate commit logs like this. The reason is that the git index should be grep'able. You may like to squash all of these commits into a single patch since they all do the same thing. The mantra is 'one thing per patch' so this makes sense in this case. Hope this helps, Tobin. ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
Re: [PATCH v2] Staging: rtl8723bs: Remove unnecessary comments.
On Sat, 2017-09-30 at 21:06 +1000, Tobin C. Harding wrote: > Hi Shreeya, > > We don't usually add a period to the subject line for kernel patches. > (reason: we only have about > 52 characters for the commit brief description so best not to waste > any). > > On Sat, Sep 30, 2017 at 01:30:34PM +0530, Shreeya Patel wrote: > > > > This patch removes unnecessary comments which are there > > to explain why call to memset is in comments. Both of the > > comments are not needed as they are not very useful. > You may like to read Documentation/process/submitting-patches.rst > (specifically > section 2) for tips on writing your git log. > > Describe your changes in imperative mood, e.g. "make xyzzy do > frotz" > instead of "[This patch] makes xyzzy do frotz" or "[I] > changed xyzzy > to do frotz", as if you are giving orders to the codebase to > change > its behaviour. > > Good luck, > Tobin. Hello, Thanks for correcting me :) I'll do the necessary changes and will send as v3. ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH] vme: Fix integer overflow checking in vme_check_window()
The controversial part of this patch is that I've changed it so we now
prevent integer overflows for VME_USER types and before we didn't. I
view it as kernel-hardening. I looked at a couple places that used
VME_USER types and they seemed pretty suspicious so I'm pretty sure
preventing overflows here is a good idea.
The most common problem which this function is for cases like VME_A16
where we don't put an upper bound on "size" so you could have "size" set
to U64_MAX and a valid vme_base would overflow the "vme_base + size"
into the valid range as well.
In the VME_A64 case, the integer overflow checking doesn't work because
"U64_MAX + 1" has an integer overflow and it's just a complicated way of
saying zero. That VME_A64 case is sort of interesting as well because
there is a VME_A64_MAX define which is set to "U64_MAX + 1". The
compiler will never let anyone use it since it can't be stored in a u64
variable... With my patch it's now limited to just U64_MAX.
Anyway, I put one integer overflow check at the start of the function
and deleted all existing checks.
Signed-off-by: Dan Carpenter
diff --git a/drivers/vme/vme.c b/drivers/vme/vme.c
index 6a3ead42aba8..5b4c898d7509 100644
--- a/drivers/vme/vme.c
+++ b/drivers/vme/vme.c
@@ -208,29 +208,27 @@ int vme_check_window(u32 aspace, unsigned long long
vme_base,
{
int retval = 0;
+ if (vme_base + size < size)
+ return -EINVAL;
+
switch (aspace) {
case VME_A16:
- if (((vme_base + size) > VME_A16_MAX) ||
- (vme_base > VME_A16_MAX))
+ if (vme_base + size > VME_A16_MAX)
retval = -EFAULT;
break;
case VME_A24:
- if (((vme_base + size) > VME_A24_MAX) ||
- (vme_base > VME_A24_MAX))
+ if (vme_base + size > VME_A24_MAX)
retval = -EFAULT;
break;
case VME_A32:
- if (((vme_base + size) > VME_A32_MAX) ||
- (vme_base > VME_A32_MAX))
+ if (vme_base + size > VME_A32_MAX)
retval = -EFAULT;
break;
case VME_A64:
- if ((size != 0) && (vme_base > U64_MAX + 1 - size))
- retval = -EFAULT;
+ /* The VME_A64_MAX limit is actually U64_MAX + 1 */
break;
case VME_CRCSR:
- if (((vme_base + size) > VME_CRCSR_MAX) ||
- (vme_base > VME_CRCSR_MAX))
+ if (vme_base + size > VME_CRCSR_MAX)
retval = -EFAULT;
break;
case VME_USER1:
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH v3] Staging: rtl8723bs: Remove unnecessary comments.
Remove unnecessary comments which are there
to explain why call to memset is in comments. Both of the
comments are not needed as they are not very useful.
Signed-off-by: Shreeya Patel
---
Changes in v2:
-Remove some more unnecessary comments and make the
commit message more appropriate.
Changes in v3:
-Make the commit message in imperative form.
drivers/staging/rtl8723bs/core/rtw_mlme.c | 3 ---
drivers/staging/rtl8723bs/core/rtw_mlme_ext.c | 3 ---
drivers/staging/rtl8723bs/core/rtw_pwrctrl.c | 2 --
drivers/staging/rtl8723bs/core/rtw_recv.c | 4
drivers/staging/rtl8723bs/core/rtw_xmit.c | 3 ---
5 files changed, 15 deletions(-)
diff --git a/drivers/staging/rtl8723bs/core/rtw_mlme.c
b/drivers/staging/rtl8723bs/core/rtw_mlme.c
index 6b77820..5b583f7 100644
--- a/drivers/staging/rtl8723bs/core/rtw_mlme.c
+++ b/drivers/staging/rtl8723bs/core/rtw_mlme.c
@@ -28,9 +28,6 @@ sint _rtw_init_mlme_priv(struct adapter *padapter)
struct mlme_priv*pmlmepriv = &padapter->mlmepriv;
sintres = _SUCCESS;
- /* We don't need to memset padapter->XXX to zero, because adapter is
allocated by vzalloc(). */
- /* memset((u8 *)pmlmepriv, 0, sizeof(struct mlme_priv)); */
-
pmlmepriv->nic_hdl = (u8 *)padapter;
pmlmepriv->pscanned = NULL;
diff --git a/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c
b/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c
index b6d137f..ca35c1c 100644
--- a/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c
+++ b/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c
@@ -474,9 +474,6 @@ int init_mlme_ext_priv(struct adapter *padapter)
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);
- /* We don't need to memset padapter->XXX to zero, because adapter is
allocated by vzalloc(). */
- /* memset((u8 *)pmlmeext, 0, sizeof(struct mlme_ext_priv)); */
-
pmlmeext->padapter = padapter;
/* fill_fwpriv(padapter, &(pmlmeext->fwpriv)); */
diff --git a/drivers/staging/rtl8723bs/core/rtw_pwrctrl.c
b/drivers/staging/rtl8723bs/core/rtw_pwrctrl.c
index aabdaaf..820a061 100644
--- a/drivers/staging/rtl8723bs/core/rtw_pwrctrl.c
+++ b/drivers/staging/rtl8723bs/core/rtw_pwrctrl.c
@@ -1193,8 +1193,6 @@ void rtw_init_pwrctrl_priv(struct adapter *padapter)
void rtw_free_pwrctrl_priv(struct adapter *adapter)
{
- /* memset((unsigned char *)pwrctrlpriv, 0, sizeof(struct
pwrctrl_priv)); */
-
#ifdef CONFIG_PNO_SUPPORT
if (pwrctrlpriv->pnlo_info != NULL)
printk("** pnlo_info memory leak\n");
diff --git a/drivers/staging/rtl8723bs/core/rtw_recv.c
b/drivers/staging/rtl8723bs/core/rtw_recv.c
index 68a6303..73e6e41 100644
--- a/drivers/staging/rtl8723bs/core/rtw_recv.c
+++ b/drivers/staging/rtl8723bs/core/rtw_recv.c
@@ -46,9 +46,6 @@ sint _rtw_init_recv_priv(struct recv_priv *precvpriv, struct
adapter *padapter)
union recv_frame *precvframe;
sintres = _SUCCESS;
- /* We don't need to memset padapter->XXX to zero, because adapter is
allocated by vzalloc(). */
- /* memset((unsigned char *)precvpriv, 0, sizeof (struct recv_priv)); */
-
spin_lock_init(&precvpriv->lock);
_rtw_init_queue(&precvpriv->free_recv_queue);
@@ -65,7 +62,6 @@ sint _rtw_init_recv_priv(struct recv_priv *precvpriv, struct
adapter *padapter)
res = _FAIL;
goto exit;
}
- /* memset(precvpriv->pallocated_frame_buf, 0, NR_RECVFRAME *
sizeof(union recv_frame) + RXFRAME_ALIGN_SZ); */
precvpriv->precv_frame_buf = (u8
*)N_BYTE_ALIGMENT((SIZE_PTR)(precvpriv->pallocated_frame_buf),
RXFRAME_ALIGN_SZ);
/* precvpriv->precv_frame_buf = precvpriv->pallocated_frame_buf +
RXFRAME_ALIGN_SZ - */
diff --git a/drivers/staging/rtl8723bs/core/rtw_xmit.c
b/drivers/staging/rtl8723bs/core/rtw_xmit.c
index 022f654..8cd05f8 100644
--- a/drivers/staging/rtl8723bs/core/rtw_xmit.c
+++ b/drivers/staging/rtl8723bs/core/rtw_xmit.c
@@ -51,9 +51,6 @@ s32 _rtw_init_xmit_priv(struct xmit_priv *pxmitpriv, struct
adapter *padapter)
struct xmit_frame *pxframe;
sintres = _SUCCESS;
- /* We don't need to memset padapter->XXX to zero, because adapter is
allocated by vzalloc(). */
- /* memset((unsigned char *)pxmitpriv, 0, sizeof(struct xmit_priv)); */
-
spin_lock_init(&pxmitpriv->lock);
spin_lock_init(&pxmitpriv->lock_sctx);
sema_init(&pxmitpriv->xmit_sema, 0);
--
2.7.4
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH] staging: rtl8192u: make r8192_wx_handlers_def structure const
Make this const as it is only stored in a const field of a pci_dev
structure. Make the declaration in the header const too.
Structure found using Coccinelle and changes done by hand.
Signed-off-by: Bhumika Goyal
---
drivers/staging/rtl8192u/r8192U_wx.c | 2 +-
drivers/staging/rtl8192u/r8192U_wx.h | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/staging/rtl8192u/r8192U_wx.c
b/drivers/staging/rtl8192u/r8192U_wx.c
index a954538..e4e6c97 100644
--- a/drivers/staging/rtl8192u/r8192U_wx.c
+++ b/drivers/staging/rtl8192u/r8192U_wx.c
@@ -964,7 +964,7 @@ struct iw_statistics *r8192_get_wireless_stats(struct
net_device *dev)
return wstats;
}
-struct iw_handler_def r8192_wx_handlers_def = {
+const struct iw_handler_def r8192_wx_handlers_def = {
.standard = r8192_wx_handlers,
.num_standard = ARRAY_SIZE(r8192_wx_handlers),
.private = r8192_private_handler,
diff --git a/drivers/staging/rtl8192u/r8192U_wx.h
b/drivers/staging/rtl8192u/r8192U_wx.h
index fb5f808..a6c2b95 100644
--- a/drivers/staging/rtl8192u/r8192U_wx.h
+++ b/drivers/staging/rtl8192u/r8192U_wx.h
@@ -17,7 +17,7 @@
#ifndef R8180_WX_H
#define R8180_WX_H
-extern struct iw_handler_def r8192_wx_handlers_def;
+extern const struct iw_handler_def r8192_wx_handlers_def;
/* Enable the rtl819x_core.c to share this function, david 2008.9.22 */
struct iw_statistics *r8192_get_wireless_stats(struct net_device *dev);
--
1.9.1
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
Re: [PATCH] staging: iio: ade7759: fix signed extension bug on shift of a u8
On Wed, 13 Sep 2017 18:02:02 +0100
Colin King wrote:
> From: Colin Ian King
>
> The current shift of st->rx[2] left shifts a u8 24 bits left,
> promotes the integer to a an int and then to a unsigned u64. If
> the top bit of st->rx[2] is set then we end up with all the upper
> bits being set to 1. Fix this by casting st->rx[2] to a u64 before
> the 24 bit left shift.
>
> Detected by CoverityScan CID#144940 ("Unintended sign extension")
>
> Fixes: 2919fa54ef64 ("staging: iio: meter: new driver for ADE7759 devices")
> Signed-off-by: Colin Ian King
Applied to the fixes-togreg branch of iio.git.
Thanks,
Jonathan
> ---
> drivers/staging/iio/meter/ade7759.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/staging/iio/meter/ade7759.c
> b/drivers/staging/iio/meter/ade7759.c
> index 1691760339da..02573c517d9d 100644
> --- a/drivers/staging/iio/meter/ade7759.c
> +++ b/drivers/staging/iio/meter/ade7759.c
> @@ -172,7 +172,7 @@ static int ade7759_spi_read_reg_40(struct device *dev,
> reg_address);
> goto error_ret;
> }
> - *val = ((u64)st->rx[1] << 32) | (st->rx[2] << 24) |
> + *val = ((u64)st->rx[1] << 32) | ((u64)st->rx[2] << 24) |
> (st->rx[3] << 16) | (st->rx[4] << 8) | st->rx[5];
>
> error_ret:
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
Re: [PATCH] staging: iio: trigger: Move header file content to source file
On Tue, 26 Sep 2017 23:56:15 +0530
Harsha Sharma wrote:
> The contents of the header file are used only by this single source file.
> Moved content into iio-trig-bfin-timer.c and removed iio-trig-bfin-timer.h
>
> Signed-off-by: Harsha Sharma
Hmm. This one again. Sometimes you need to not just consider whether a
structure is in use elsewhere in the kernel, but rather what it is for.
If you had done this here you would have discovered the delights of board
files - the means we used to use to describe individual hardware configurations
on ARM before we had device tree (there are still some under arch/arm/mach-pxa
for example).
The upshot is that if this driver ever moved out of staging and we still
had it configured with platform data - this file would go in
include/linux/platform_data/
Whilst a driver is in staging - all it's code must not be outside
staging which leads to these files being in an unusual location.
Jonathan
> ---
> drivers/staging/iio/trigger/iio-trig-bfin-timer.c | 20 ++-
> drivers/staging/iio/trigger/iio-trig-bfin-timer.h | 24
> ---
> 2 files changed, 19 insertions(+), 25 deletions(-)
> delete mode 100644 drivers/staging/iio/trigger/iio-trig-bfin-timer.h
>
> diff --git a/drivers/staging/iio/trigger/iio-trig-bfin-timer.c
> b/drivers/staging/iio/trigger/iio-trig-bfin-timer.c
> index d80dcf8..2cedcaf 100644
> --- a/drivers/staging/iio/trigger/iio-trig-bfin-timer.c
> +++ b/drivers/staging/iio/trigger/iio-trig-bfin-timer.c
> @@ -19,7 +19,25 @@
> #include
> #include
>
> -#include "iio-trig-bfin-timer.h"
> +/**
> + * struct iio_bfin_timer_trigger_pdata - timer trigger platform data
> + * @output_enable: Enable external trigger pulse generation.
> + * @active_low: Whether the trigger pulse is active low.
> + * @duty_ns: Length of the trigger pulse in nanoseconds.
> + *
> + * This struct is used to configure the output pulse generation of the
> blackfin
> + * timer trigger. If output_enable is set to true an external trigger signal
> + * will generated on the pin corresponding to the timer. This is useful for
> + * converters which needs an external signal to start conversion. active_low
> and
> + * duty_ns are used to configure the type of the trigger pulse. If
> output_enable
> + * is set to false no external trigger pulse will be generated and active_low
> + * and duty_ns are ignored.
> + **/
> +struct iio_bfin_timer_trigger_pdata {
> + bool output_enable;
> + bool active_low;
> + unsigned int duty_ns;
> +};
>
> struct bfin_timer {
> unsigned short id, bit;
> diff --git a/drivers/staging/iio/trigger/iio-trig-bfin-timer.h
> b/drivers/staging/iio/trigger/iio-trig-bfin-timer.h
> deleted file mode 100644
> index c07321f..000
> --- a/drivers/staging/iio/trigger/iio-trig-bfin-timer.h
> +++ /dev/null
> @@ -1,24 +0,0 @@
> -#ifndef __IIO_BFIN_TIMER_TRIGGER_H__
> -#define __IIO_BFIN_TIMER_TRIGGER_H__
> -
> -/**
> - * struct iio_bfin_timer_trigger_pdata - timer trigger platform data
> - * @output_enable: Enable external trigger pulse generation.
> - * @active_low: Whether the trigger pulse is active low.
> - * @duty_ns: Length of the trigger pulse in nanoseconds.
> - *
> - * This struct is used to configure the output pulse generation of the
> blackfin
> - * timer trigger. If output_enable is set to true an external trigger signal
> - * will generated on the pin corresponding to the timer. This is useful for
> - * converters which needs an external signal to start conversion. active_low
> and
> - * duty_ns are used to configure the type of the trigger pulse. If
> output_enable
> - * is set to false no external trigger pulse will be generated and active_low
> - * and duty_ns are ignored.
> - **/
> -struct iio_bfin_timer_trigger_pdata {
> - bool output_enable;
> - bool active_low;
> - unsigned int duty_ns;
> -};
> -
> -#endif
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
Re: [PATCH v3] Staging: rtl8723bs: Remove unnecessary comments.
On Sat, Sep 30, 2017 at 07:41:11PM +0530, Shreeya Patel wrote:
> Remove unnecessary comments which are there
> to explain why call to memset is in comments. Both of the
> comments are not needed as they are not very useful.
>
>
> Signed-off-by: Shreeya Patel
> ---
> Changes in v2:
> -Remove some more unnecessary comments and make the
>commit message more appropriate.
>
> Changes in v3:
> -Make the commit message in imperative form.
Well done. You forgot the period on the commit subject. Here is a blog post you
might like (it is
not kernel specific but useful still IMO).
Good luck,
Tobin.
> drivers/staging/rtl8723bs/core/rtw_mlme.c | 3 ---
> drivers/staging/rtl8723bs/core/rtw_mlme_ext.c | 3 ---
> drivers/staging/rtl8723bs/core/rtw_pwrctrl.c | 2 --
> drivers/staging/rtl8723bs/core/rtw_recv.c | 4
> drivers/staging/rtl8723bs/core/rtw_xmit.c | 3 ---
> 5 files changed, 15 deletions(-)
>
> diff --git a/drivers/staging/rtl8723bs/core/rtw_mlme.c
> b/drivers/staging/rtl8723bs/core/rtw_mlme.c
> index 6b77820..5b583f7 100644
> --- a/drivers/staging/rtl8723bs/core/rtw_mlme.c
> +++ b/drivers/staging/rtl8723bs/core/rtw_mlme.c
> @@ -28,9 +28,6 @@ sint_rtw_init_mlme_priv(struct adapter *padapter)
> struct mlme_priv*pmlmepriv = &padapter->mlmepriv;
> sintres = _SUCCESS;
>
> - /* We don't need to memset padapter->XXX to zero, because adapter is
> allocated by vzalloc(). */
> - /* memset((u8 *)pmlmepriv, 0, sizeof(struct mlme_priv)); */
> -
> pmlmepriv->nic_hdl = (u8 *)padapter;
>
> pmlmepriv->pscanned = NULL;
> diff --git a/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c
> b/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c
> index b6d137f..ca35c1c 100644
> --- a/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c
> +++ b/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c
> @@ -474,9 +474,6 @@ int init_mlme_ext_priv(struct adapter *padapter)
> struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
> struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);
>
> - /* We don't need to memset padapter->XXX to zero, because adapter is
> allocated by vzalloc(). */
> - /* memset((u8 *)pmlmeext, 0, sizeof(struct mlme_ext_priv)); */
> -
> pmlmeext->padapter = padapter;
>
> /* fill_fwpriv(padapter, &(pmlmeext->fwpriv)); */
> diff --git a/drivers/staging/rtl8723bs/core/rtw_pwrctrl.c
> b/drivers/staging/rtl8723bs/core/rtw_pwrctrl.c
> index aabdaaf..820a061 100644
> --- a/drivers/staging/rtl8723bs/core/rtw_pwrctrl.c
> +++ b/drivers/staging/rtl8723bs/core/rtw_pwrctrl.c
> @@ -1193,8 +1193,6 @@ void rtw_init_pwrctrl_priv(struct adapter *padapter)
>
> void rtw_free_pwrctrl_priv(struct adapter *adapter)
> {
> - /* memset((unsigned char *)pwrctrlpriv, 0, sizeof(struct
> pwrctrl_priv)); */
> -
> #ifdef CONFIG_PNO_SUPPORT
> if (pwrctrlpriv->pnlo_info != NULL)
> printk("** pnlo_info memory leak\n");
> diff --git a/drivers/staging/rtl8723bs/core/rtw_recv.c
> b/drivers/staging/rtl8723bs/core/rtw_recv.c
> index 68a6303..73e6e41 100644
> --- a/drivers/staging/rtl8723bs/core/rtw_recv.c
> +++ b/drivers/staging/rtl8723bs/core/rtw_recv.c
> @@ -46,9 +46,6 @@ sint _rtw_init_recv_priv(struct recv_priv *precvpriv,
> struct adapter *padapter)
> union recv_frame *precvframe;
> sintres = _SUCCESS;
>
> - /* We don't need to memset padapter->XXX to zero, because adapter is
> allocated by vzalloc(). */
> - /* memset((unsigned char *)precvpriv, 0, sizeof (struct recv_priv)); */
> -
> spin_lock_init(&precvpriv->lock);
>
> _rtw_init_queue(&precvpriv->free_recv_queue);
> @@ -65,7 +62,6 @@ sint _rtw_init_recv_priv(struct recv_priv *precvpriv,
> struct adapter *padapter)
> res = _FAIL;
> goto exit;
> }
> - /* memset(precvpriv->pallocated_frame_buf, 0, NR_RECVFRAME *
> sizeof(union recv_frame) + RXFRAME_ALIGN_SZ); */
>
> precvpriv->precv_frame_buf = (u8
> *)N_BYTE_ALIGMENT((SIZE_PTR)(precvpriv->pallocated_frame_buf),
> RXFRAME_ALIGN_SZ);
> /* precvpriv->precv_frame_buf = precvpriv->pallocated_frame_buf +
> RXFRAME_ALIGN_SZ - */
> diff --git a/drivers/staging/rtl8723bs/core/rtw_xmit.c
> b/drivers/staging/rtl8723bs/core/rtw_xmit.c
> index 022f654..8cd05f8 100644
> --- a/drivers/staging/rtl8723bs/core/rtw_xmit.c
> +++ b/drivers/staging/rtl8723bs/core/rtw_xmit.c
> @@ -51,9 +51,6 @@ s32 _rtw_init_xmit_priv(struct xmit_priv *pxmitpriv, struct
> adapter *padapter)
> struct xmit_frame *pxframe;
> sintres = _SUCCESS;
>
> - /* We don't need to memset padapter->XXX to zero, because adapter is
> allocated by vzalloc(). */
> - /* memset((unsigned char *)pxmitpriv, 0, sizeof(struct xmit_priv)); */
> -
> spin_lock_init(&pxmitpriv->lock);
> spin_lock_init(&pxmitpriv->lock_sctx);
> sema_init(&pxmitpriv->xmit_sema, 0);
> --
> 2.7.4
>
>
