[PATCH] staging:rtl8712:usb_ops_linux.c: Avoid CamelCase

harsha harshasharmaiitr at gmail.com
Fri Aug 25 17:47:04 UTC 2017


Signed-off-by: harsha <harshasharmaiitr at gmail.com>
---
 drivers/staging/rtl8712/usb_ops_linux.c | 35 +++++++++++++++++----------------
 1 file changed, 18 insertions(+), 17 deletions(-)

diff --git a/drivers/staging/rtl8712/usb_ops_linux.c b/drivers/staging/rtl8712/usb_ops_linux.c
index 31f204a..7939902 100644
--- a/drivers/staging/rtl8712/usb_ops_linux.c
+++ b/drivers/staging/rtl8712/usb_ops_linux.c
@@ -158,9 +158,9 @@ static void usb_write_mem_complete(struct urb *purb)
 
 	if (purb->status != 0) {
 		if (purb->status == (-ESHUTDOWN))
-			padapter->bDriverStopped = true;
+			padapter->b_driverstopped = true;
 		else
-			padapter->bSurpriseRemoved = true;
+			padapter->b_surpriseremoved = true;
 	}
 	complete(&pintfpriv->io_retevt_comp);
 }
@@ -175,7 +175,7 @@ void r8712_usb_write_mem(struct intf_hdl *pintfhdl, u32 addr, u32 cnt, u8 *wmem)
 	struct usb_device *pusbd = pdvobj->pusbdev;
 	struct urb *piorw_urb = pintfpriv->piorw_urb;
 
-	if ((padapter->bDriverStopped) || (padapter->bSurpriseRemoved) ||
+	if ((padapter->b_driverstopped) || (padapter->b_surpriseremoved) ||
 	    (padapter->pwrctrlpriv.pnp_bstop_trx))
 		return;
 	/* translate DMA FIFO addr to pipehandle */
@@ -197,7 +197,7 @@ static void r8712_usb_read_port_complete(struct urb *purb)
 	struct _adapter *padapter = (struct _adapter *)precvbuf->adapter;
 	struct recv_priv *precvpriv = &padapter->recvpriv;
 
-	if (padapter->bSurpriseRemoved || padapter->bDriverStopped)
+	if (padapter->b_surpriseremoved || padapter->b_driverstopped)
 		return;
 	if (purb->status == 0) { /* SUCCESS */
 		if ((purb->actual_length > (MAX_RECVBUF_SZ)) ||
@@ -229,11 +229,11 @@ static void r8712_usb_read_port_complete(struct urb *purb)
 		case -EPIPE:
 		case -ENODEV:
 		case -ESHUTDOWN:
-			padapter->bDriverStopped = true;
+			padapter->b_driverstopped = true;
 			break;
 		case -ENOENT:
-			if (!padapter->bSuspended) {
-				padapter->bDriverStopped = true;
+			if (!padapter->b_suspended) {
+				padapter->b_driverstopped = true;
 				break;
 			}
 			/* Fall through. */
@@ -265,7 +265,7 @@ u32 r8712_usb_read_port(struct intf_hdl *pintfhdl, u32 addr, u32 cnt, u8 *rmem)
 	struct recv_priv *precvpriv = &adapter->recvpriv;
 	struct usb_device *pusbd = pdvobj->pusbdev;
 
-	if (adapter->bDriverStopped || adapter->bSurpriseRemoved ||
+	if (adapter->b_driverstopped || adapter->b_surpriseremoved ||
 	    adapter->pwrctrlpriv.pnp_bstop_trx || !precvbuf)
 		return _FAIL;
 	r8712_init_recvbuf(adapter, precvbuf);
@@ -325,8 +325,8 @@ void r8712_xmit_bh(void *priv)
 	struct _adapter *padapter = priv;
 	struct xmit_priv *pxmitpriv = &padapter->xmitpriv;
 
-	if (padapter->bDriverStopped ||
-	    padapter->bSurpriseRemoved) {
+	if (padapter->b_driverstopped ||
+	    padapter->b_surpriseremoved) {
 		netdev_err(padapter->pnetdev, "xmit_bh => bDriverStopped or bSurpriseRemoved\n");
 		return;
 	}
@@ -371,7 +371,7 @@ static void usb_write_port_complete(struct urb *purb)
 			break;
 		}
 	}
-	if (padapter->bSurpriseRemoved)
+	if (padapter->b_surpriseremoved)
 		return;
 	switch (purb->status) {
 	case 0:
@@ -401,7 +401,7 @@ u32 r8712_usb_write_port(struct intf_hdl *pintfhdl, u32 addr, u32 cnt, u8 *wmem)
 	struct usb_device *pusbd = pdvobj->pusbdev;
 	struct pkt_attrib *pattrib = &pxmitframe->attrib;
 
-	if ((padapter->bDriverStopped) || (padapter->bSurpriseRemoved) ||
+	if ((padapter->b_driverstopped) || (padapter->b_surpriseremoved) ||
 	    (padapter->pwrctrlpriv.pnp_bstop_trx))
 		return _FAIL;
 	for (i = 0; i < 8; i++) {
@@ -489,28 +489,29 @@ int r8712_usbctrl_vendorreq(struct intf_priv *pintfpriv, u8 request, u16 value,
 	/* For mstar platform, mstar suggests the address for USB IO
 	 * should be 16 bytes alignment. Trying to fix it here.
 	 */
-	u8 *palloc_buf, *pIo_buf;
+	u8 *palloc_buf, *p_io_buf;
 
 	palloc_buf = kmalloc((u32)len + 16, GFP_ATOMIC);
 	if (!palloc_buf)
 		return -ENOMEM;
-	pIo_buf = palloc_buf + 16 - ((addr_t)(palloc_buf) & 0x0f);
+	p_io_buf = palloc_buf + 16 - ((addr_t)(palloc_buf) & 0x0f);
+
 	if (requesttype == 0x01) {
 		pipe = usb_rcvctrlpipe(udev, 0); /* read_in */
 		reqtype =  RTL871X_VENQT_READ;
 	} else {
 		pipe = usb_sndctrlpipe(udev, 0); /* write_out */
 		reqtype =  RTL871X_VENQT_WRITE;
-		memcpy(pIo_buf, pdata, len);
+		memcpy(p_io_buf, pdata, len);
 	}
 	status = usb_control_msg(udev, pipe, request, reqtype, value, index,
-				 pIo_buf, len, HZ / 2);
+				 p_io_buf, len, HZ / 2);
 	if (status > 0) {  /* Success this control transfer. */
 		if (requesttype == 0x01) {
 			/* For Control read transfer, we have to copy the read
 			 * data from pIo_buf to pdata.
 			 */
-			memcpy(pdata, pIo_buf,  status);
+			memcpy(pdata, p_io_buf,  status);
 		}
 	}
 	kfree(palloc_buf);
-- 
1.9.1



More information about the devel mailing list