Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7227ba06 authored by Javier Martinez Canillas's avatar Javier Martinez Canillas Committed by Greg Kroah-Hartman
Browse files

Staging: bcm: Bcmchar: Fix style issues on bcm_char_read() 



Signed-off-by: default avatarJavier Martinez Canillas <martinez.javier@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent a7d3976e

drivers/staging/bcm/Bcmchar.c

+28 −24
Original line number Diff line number Diff line
@@ -96,25 +96,28 @@ static int bcm_char_release(struct inode *inode, struct file *filp) 
	return 0;

}



static ssize_t bcm_char_read(struct file *filp, char __user *buf, size_t size, loff_t *f_pos)

static ssize_t bcm_char_read(struct file *filp, char __user *buf, size_t size,

			     loff_t *f_pos)

{

	PPER_TARANG_DATA pTarang = filp->private_data;

	PMINI_ADAPTER	Adapter = pTarang->Adapter;

	struct sk_buff *Packet = NULL;

	ssize_t         PktLen = 0;

	int             wait_ret_val = 0;

	unsigned long ret = 0;



	wait_ret_val = wait_event_interruptible(Adapter->process_read_wait_queue,

		(pTarang->RxAppControlHead || Adapter->device_removed));

	if((wait_ret_val == -ERESTARTSYS))

	{

   		BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, "Exiting as i've been asked to exit!!!\n");

						(pTarang->RxAppControlHead ||

						 Adapter->device_removed));

	if ((wait_ret_val == -ERESTARTSYS)) {

		BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL,

				"Exiting as i've been asked to exit!!!\n");

		return wait_ret_val;

	}



	if(Adapter->device_removed)

	{

		BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, "Device Removed... Killing the Apps...\n");

	if (Adapter->device_removed) {

		BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL,

				"Device Removed... Killing the Apps...\n");

		return -ENODEV;

	}
@@ -123,22 +126,23 @@ static ssize_t bcm_char_read(struct file *filp, char __user *buf, size_t size, l 


	down(&Adapter->RxAppControlQueuelock);



	if(pTarang->RxAppControlHead)

	{

	if (pTarang->RxAppControlHead) {

		Packet = pTarang->RxAppControlHead;

		DEQUEUEPACKET(pTarang->RxAppControlHead,pTarang->RxAppControlTail);

		DEQUEUEPACKET(pTarang->RxAppControlHead,

			      pTarang->RxAppControlTail);

		pTarang->AppCtrlQueueLen--;

	}



	up(&Adapter->RxAppControlQueuelock);



	if(Packet)

	{

	if (Packet) {

		PktLen = Packet->len;

		if(copy_to_user(buf, Packet->data, min_t(size_t, PktLen, size)))

		{

		ret = copy_to_user(buf, Packet->data,

				   min_t(size_t, PktLen, size));

		if (ret) {

			dev_kfree_skb(Packet);

			BCM_DEBUG_PRINT(Adapter,DBG_TYPE_PRINTK, 0, 0, "\nReturning from copy to user failure \n");

			BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0,

					"Returning from copy to user failure\n");

			return -EFAULT;

		}

		BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL,
@@ -147,7 +151,7 @@ static ssize_t bcm_char_read(struct file *filp, char __user *buf, size_t size, l 
		dev_kfree_skb(Packet);

	}



    BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, "<====\n");

	BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, "<\n");

	return PktLen;

}