Commit f90a8a25 authored by Matthias Beyer's avatar Matthias Beyer Committed by Greg Kroah-Hartman

Staging: bcm: Bcmchar.c: Renamed variable "pTarang" -> "tarang"

Renamed variable "pTarang" -> "tarang" in

    bcm_char_open()
    bcm_char_release()
    bcm_char_read()
Signed-off-by: default avatarMatthias Beyer <mail@beyermatthias.de>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 900025a3
...@@ -105,23 +105,23 @@ static int handle_flash2x_adapter(struct bcm_mini_adapter *ad, ...@@ -105,23 +105,23 @@ static int handle_flash2x_adapter(struct bcm_mini_adapter *ad,
static int bcm_char_open(struct inode *inode, struct file *filp) static int bcm_char_open(struct inode *inode, struct file *filp)
{ {
struct bcm_mini_adapter *ad = NULL; struct bcm_mini_adapter *ad = NULL;
struct bcm_tarang_data *pTarang = NULL; struct bcm_tarang_data *tarang = NULL;
ad = GET_BCM_ADAPTER(gblpnetdev); ad = GET_BCM_ADAPTER(gblpnetdev);
pTarang = kzalloc(sizeof(struct bcm_tarang_data), GFP_KERNEL); tarang = kzalloc(sizeof(struct bcm_tarang_data), GFP_KERNEL);
if (!pTarang) if (!tarang)
return -ENOMEM; return -ENOMEM;
pTarang->Adapter = ad; tarang->Adapter = ad;
pTarang->RxCntrlMsgBitMask = 0xFFFFFFFF & ~(1 << 0xB); tarang->RxCntrlMsgBitMask = 0xFFFFFFFF & ~(1 << 0xB);
down(&ad->RxAppControlQueuelock); down(&ad->RxAppControlQueuelock);
pTarang->next = ad->pTarangs; tarang->next = ad->pTarangs;
ad->pTarangs = pTarang; ad->pTarangs = tarang;
up(&ad->RxAppControlQueuelock); up(&ad->RxAppControlQueuelock);
/* Store the Adapter structure */ /* Store the Adapter structure */
filp->private_data = pTarang; filp->private_data = tarang;
/* Start Queuing the control response Packets */ /* Start Queuing the control response Packets */
atomic_inc(&ad->ApplicationRunning); atomic_inc(&ad->ApplicationRunning);
...@@ -132,22 +132,22 @@ static int bcm_char_open(struct inode *inode, struct file *filp) ...@@ -132,22 +132,22 @@ static int bcm_char_open(struct inode *inode, struct file *filp)
static int bcm_char_release(struct inode *inode, struct file *filp) static int bcm_char_release(struct inode *inode, struct file *filp)
{ {
struct bcm_tarang_data *pTarang, *tmp, *ptmp; struct bcm_tarang_data *tarang, *tmp, *ptmp;
struct bcm_mini_adapter *ad = NULL; struct bcm_mini_adapter *ad = NULL;
struct sk_buff *pkt, *npkt; struct sk_buff *pkt, *npkt;
pTarang = (struct bcm_tarang_data *)filp->private_data; tarang = (struct bcm_tarang_data *)filp->private_data;
if (pTarang == NULL) if (tarang == NULL)
return 0; return 0;
ad = pTarang->Adapter; ad = tarang->Adapter;
down(&ad->RxAppControlQueuelock); down(&ad->RxAppControlQueuelock);
tmp = ad->pTarangs; tmp = ad->pTarangs;
for (ptmp = NULL; tmp; ptmp = tmp, tmp = tmp->next) { for (ptmp = NULL; tmp; ptmp = tmp, tmp = tmp->next) {
if (tmp == pTarang) if (tmp == tarang)
break; break;
} }
...@@ -161,7 +161,7 @@ static int bcm_char_release(struct inode *inode, struct file *filp) ...@@ -161,7 +161,7 @@ static int bcm_char_release(struct inode *inode, struct file *filp)
return 0; return 0;
} }
pkt = pTarang->RxAppControlHead; pkt = tarang->RxAppControlHead;
while (pkt) { while (pkt) {
npkt = pkt->next; npkt = pkt->next;
kfree_skb(pkt); kfree_skb(pkt);
...@@ -173,7 +173,7 @@ static int bcm_char_release(struct inode *inode, struct file *filp) ...@@ -173,7 +173,7 @@ static int bcm_char_release(struct inode *inode, struct file *filp)
/* Stop Queuing the control response Packets */ /* Stop Queuing the control response Packets */
atomic_dec(&ad->ApplicationRunning); atomic_dec(&ad->ApplicationRunning);
kfree(pTarang); kfree(tarang);
/* remove this filp from the asynchronously notified filp's */ /* remove this filp from the asynchronously notified filp's */
filp->private_data = NULL; filp->private_data = NULL;
...@@ -185,8 +185,8 @@ static ssize_t bcm_char_read(struct file *filp, ...@@ -185,8 +185,8 @@ static ssize_t bcm_char_read(struct file *filp,
size_t size, size_t size,
loff_t *f_pos) loff_t *f_pos)
{ {
struct bcm_tarang_data *pTarang = filp->private_data; struct bcm_tarang_data *tarang = filp->private_data;
struct bcm_mini_adapter *ad = pTarang->Adapter; struct bcm_mini_adapter *ad = tarang->Adapter;
struct sk_buff *Packet = NULL; struct sk_buff *Packet = NULL;
ssize_t PktLen = 0; ssize_t PktLen = 0;
int wait_ret_val = 0; int wait_ret_val = 0;
...@@ -194,7 +194,7 @@ static ssize_t bcm_char_read(struct file *filp, ...@@ -194,7 +194,7 @@ static ssize_t bcm_char_read(struct file *filp,
wait_ret_val = wait_event_interruptible( wait_ret_val = wait_event_interruptible(
ad->process_read_wait_queue, ad->process_read_wait_queue,
(pTarang->RxAppControlHead || (tarang->RxAppControlHead ||
ad->device_removed)); ad->device_removed));
if ((wait_ret_val == -ERESTARTSYS)) { if ((wait_ret_val == -ERESTARTSYS)) {
...@@ -214,11 +214,11 @@ static ssize_t bcm_char_read(struct file *filp, ...@@ -214,11 +214,11 @@ static ssize_t bcm_char_read(struct file *filp,
down(&ad->RxAppControlQueuelock); down(&ad->RxAppControlQueuelock);
if (pTarang->RxAppControlHead) { if (tarang->RxAppControlHead) {
Packet = pTarang->RxAppControlHead; Packet = tarang->RxAppControlHead;
DEQUEUEPACKET(pTarang->RxAppControlHead, DEQUEUEPACKET(tarang->RxAppControlHead,
pTarang->RxAppControlTail); tarang->RxAppControlTail);
pTarang->AppCtrlQueueLen--; tarang->AppCtrlQueueLen--;
} }
up(&ad->RxAppControlQueuelock); up(&ad->RxAppControlQueuelock);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment