From cc9b5222f225d03d8815a4d7225f0cbf01755ef3 Mon Sep 17 00:00:00 2001 From: Gorskin Ilya Date: Thu, 18 Mar 2010 14:56:47 +0500 Subject: [PATCH] Staging: rt2860: fix coding style issue in rt_linux.c Signed-off-by: Gorskin Ilya Signed-off-by: Greg Kroah-Hartman --- drivers/staging/rt2860/rt_linux.c | 42 +++++++++++++++---------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/drivers/staging/rt2860/rt_linux.c b/drivers/staging/rt2860/rt_linux.c index fd9a2072139b..bfda187d2fbb 100644 --- a/drivers/staging/rt2860/rt_linux.c +++ b/drivers/staging/rt2860/rt_linux.c @@ -82,7 +82,7 @@ char const *pWirelessFloodEventText[IW_FLOOD_EVENT_TYPE_NUM] = { }; /* timeout -- ms */ -void RTMP_SetPeriodicTimer(struct timer_list * pTimer, +void RTMP_SetPeriodicTimer(struct timer_list *pTimer, IN unsigned long timeout) { timeout = ((timeout * OS_HZ) / 1000); @@ -92,7 +92,7 @@ void RTMP_SetPeriodicTimer(struct timer_list * pTimer, /* convert NdisMInitializeTimer --> RTMP_OS_Init_Timer */ void RTMP_OS_Init_Timer(struct rt_rtmp_adapter *pAd, - struct timer_list * pTimer, + struct timer_list *pTimer, IN TIMER_FUNCTION function, void *data) { init_timer(pTimer); @@ -100,7 +100,7 @@ void RTMP_OS_Init_Timer(struct rt_rtmp_adapter *pAd, pTimer->function = function; } -void RTMP_OS_Add_Timer(struct timer_list * pTimer, +void RTMP_OS_Add_Timer(struct timer_list *pTimer, IN unsigned long timeout) { if (timer_pending(pTimer)) @@ -111,14 +111,14 @@ void RTMP_OS_Add_Timer(struct timer_list * pTimer, add_timer(pTimer); } -void RTMP_OS_Mod_Timer(struct timer_list * pTimer, +void RTMP_OS_Mod_Timer(struct timer_list *pTimer, IN unsigned long timeout) { timeout = ((timeout * OS_HZ) / 1000); mod_timer(pTimer, jiffies + timeout); } -void RTMP_OS_Del_Timer(struct timer_list * pTimer, +void RTMP_OS_Del_Timer(struct timer_list *pTimer, OUT BOOLEAN * pCancelled) { if (timer_pending(pTimer)) { @@ -146,7 +146,7 @@ void RTMPusecDelay(unsigned long usec) udelay(usec % 50); } -void RTMP_GetCurrentSystemTime(LARGE_INTEGER * time) +void RTMP_GetCurrentSystemTime(LARGE_INTEGER *time) { time->u.LowPart = jiffies; } @@ -156,9 +156,9 @@ int os_alloc_mem(struct rt_rtmp_adapter *pAd, u8 ** mem, unsigned long size) { *mem = (u8 *)kmalloc(size, GFP_ATOMIC); if (*mem) - return (NDIS_STATUS_SUCCESS); + return NDIS_STATUS_SUCCESS; else - return (NDIS_STATUS_FAILURE); + return NDIS_STATUS_FAILURE; } /* pAd MUST allow to be NULL */ @@ -167,7 +167,7 @@ int os_free_mem(struct rt_rtmp_adapter *pAd, void *mem) ASSERT(mem); kfree(mem); - return (NDIS_STATUS_SUCCESS); + return NDIS_STATUS_SUCCESS; } void *RtmpOSNetPktAlloc(struct rt_rtmp_adapter *pAd, IN int size) @@ -176,7 +176,7 @@ void *RtmpOSNetPktAlloc(struct rt_rtmp_adapter *pAd, IN int size) /* Add 2 more bytes for ip header alignment */ skb = dev_alloc_skb(size + 2); - return ((void *)skb); + return (void *)skb; } void *RTMP_AllocateFragPacketBuffer(struct rt_rtmp_adapter *pAd, @@ -201,7 +201,7 @@ void *RTMP_AllocateFragPacketBuffer(struct rt_rtmp_adapter *pAd, void *RTMP_AllocateTxPacketBuffer(struct rt_rtmp_adapter *pAd, unsigned long Length, IN BOOLEAN Cached, - void ** VirtualAddress) + void **VirtualAddress) { struct sk_buff *pkt; @@ -271,7 +271,7 @@ void RTMPFreeAdapter(struct rt_rtmp_adapter *pAd) BOOLEAN OS_Need_Clone_Packet(void) { - return (FALSE); + return FALSE; } /* @@ -299,7 +299,7 @@ BOOLEAN OS_Need_Clone_Packet(void) int RTMPCloneNdisPacket(struct rt_rtmp_adapter *pAd, IN BOOLEAN pInsAMSDUHdr, void *pInPacket, - void ** ppOutPacket) + void **ppOutPacket) { struct sk_buff *pkt; @@ -328,7 +328,7 @@ int RTMPCloneNdisPacket(struct rt_rtmp_adapter *pAd, /* the allocated NDIS PACKET must be freed via RTMPFreeNdisPacket() */ int RTMPAllocateNdisPacket(struct rt_rtmp_adapter *pAd, - void ** ppPacket, + void **ppPacket, u8 *pHeader, u32 HeaderLen, u8 *pData, u32 DataLen) @@ -391,7 +391,7 @@ int Sniff2BytesFromNdisBuffer(char *pFirstBuffer, void RTMP_QueryPacketInfo(void *pPacket, struct rt_packet_info *pPacketInfo, - u8 ** pSrcBufVA, u32 * pSrcBufLen) + u8 **pSrcBufVA, u32 * pSrcBufLen) { pPacketInfo->BufferCount = 1; pPacketInfo->pFirstBuffer = (char *)GET_OS_PKT_DATAPTR(pPacket); @@ -402,9 +402,9 @@ void RTMP_QueryPacketInfo(void *pPacket, *pSrcBufLen = GET_OS_PKT_LEN(pPacket); } -void RTMP_QueryNextPacketInfo(void ** ppPacket, +void RTMP_QueryNextPacketInfo(void **ppPacket, struct rt_packet_info *pPacketInfo, - u8 ** pSrcBufVA, u32 * pSrcBufLen) + u8 **pSrcBufVA, u32 * pSrcBufLen) { void *pPacket = NULL; @@ -589,7 +589,7 @@ rt_get_sg_list_from_packet(void *pPacket, struct rt_rtmp_sg_list *sg) sg->NumberOfElements = 1; sg->Elements[0].Address = GET_OS_PKT_DATAPTR(pPacket); sg->Elements[0].Length = GET_OS_PKT_LEN(pPacket); - return (sg); + return sg; } void hex_dump(char *str, unsigned char *pSrcBufVA, unsigned int SrcBufLen) @@ -1062,7 +1062,7 @@ void RtmpOSTaskCustomize(struct rt_rtmp_os_task *pTask) #ifndef KTHREAD_SUPPORT - daemonize((char *)& pTask->taskName[0] /*"%s",pAd->net_dev->name */ ); + daemonize((char *)&pTask->taskName[0] /*"%s",pAd->net_dev->name */); allow_signal(SIGTERM); allow_signal(SIGKILL); @@ -1247,7 +1247,7 @@ void RtmpOSNetDevFree(struct net_device *pNetDev) free_netdev(pNetDev); } -int RtmpOSNetDevAlloc(struct net_device ** new_dev_p, u32 privDataSize) +int RtmpOSNetDevAlloc(struct net_device **new_dev_p, u32 privDataSize) { /* assign it as null first. */ *new_dev_p = NULL; @@ -1344,7 +1344,7 @@ struct net_device *RtmpOSNetDevCreate(struct rt_rtmp_adapter *pAd, int status; /* allocate a new network device */ - status = RtmpOSNetDevAlloc(&pNetDev, 0 /*privMemSize */ ); + status = RtmpOSNetDevAlloc(&pNetDev, 0 /*privMemSize */); if (status != NDIS_STATUS_SUCCESS) { /* allocation fail, exit */ DBGPRINT(RT_DEBUG_ERROR, -- 2.20.1